AAAAAAAAAAAAAAAAAAAAAAAAAA

code/modules/power/cell.dm

@@ -462,13 +462,9 @@
 	charge = 0
 	update_icon()
 
-/obj/item/stock_parts/cell/gun/SolGov
+/obj/item/stock_parts/cell/gun/solgov
 	name = "SolGov power cell"
-	icon = 'icons/obj/power.dmi'
-	icon_state = "g-cell"
-	maxcharge = 8000
-	custom_materials = list(/datum/material/glass=60)
-	chargerate = 2000
+	icon_state = "g-sg-cell"
 
 /obj/item/stock_parts/cell/gun/large
 	name = "extra-large weapon power cell"

code/modules/projectiles/ammunition/ballistic/smg.dm

@@ -26,29 +26,29 @@
 	caliber = "4.73x33mm caseless"
 	projectile_type = /obj/projectile/bullet/c47x33mm
 
-/obj/item/ammo_casing/caseless/c556mmHITP
-	name = "5.56mm HITP caseless round"
-	desc = "A 5.56mm HITP caseless round."
+/obj/item/ammo_casing/caseless/c556mm
+	name = "5.56mm caseless round"
+	desc = "A 5.56mm caseless round."
 	icon_state = "caseless"
-	caliber = "5.56mm HITP caseless"
-	projectile_type = /obj/projectile/bullet/c556mmHITP
+	caliber = "5.56mm caseless"
+	projectile_type = /obj/projectile/bullet/c556mm
 
-/obj/item/ammo_casing/caseless/c556mmHITP/surplus
+/obj/item/ammo_casing/caseless/c556mm/surplus
 	name = "5.56mm HITP caseless surplus round"
 	desc = "A 5.56mm HITP caseless surplus round."
-	projectile_type = /obj/projectile/bullet/c556mmHITP_surplus
+	projectile_type = /obj/projectile/bullet/c556mm_surplus
 
-/obj/item/ammo_casing/caseless/c556mmHITP/ap
+/obj/item/ammo_casing/caseless/c556mm/ap
 	name = "5.56mm HITP caseless armor piercing round"
 	desc = "A 5.56mm HITP caseless armor piercing round."
-	projectile_type = /obj/projectile/bullet/c556mmHITP_ap
+	projectile_type = /obj/projectile/bullet/c556mm_ap
 
-/obj/item/ammo_casing/caseless/c556mmHITP/hp
+/obj/item/ammo_casing/caseless/c556mm/hp
 	name = "5.56mm HITP caseless hollow-point round"
 	desc = "A 5.56mm HITP caseless hollow-point round."
-	projectile_type = /obj/projectile/bullet/c556mmHITP_hp
+	projectile_type = /obj/projectile/bullet/c556mm_hp
 
-/obj/item/ammo_casing/caseless/c556mmHITP/rubbershot
+/obj/item/ammo_casing/caseless/c556mm/rubbershot
 	name = "5.56mm HITP rubber round"
 	desc = "A 5.56mm HITP caseless rubber round."
-	projectile_type = /obj/projectile/bullet/c556mmHITP/rubbershot
+	projectile_type = /obj/projectile/bullet/c556mm/rubbershot

code/modules/projectiles/ammunition/special/gauss.dm

@@ -19,8 +19,8 @@
 /obj/item/ammo_casing/caseless/gauss/slug
 	name = "ferromagnetic slug"
 	desc = "A large metal slug."
-	caliber = "lance"
+	caliber = "slug"
 	icon_state = "gauss-slug"
 	projectile_type = /obj/projectile/bullet/gauss/slug
 	auto_rotate = TRUE
-	energy_cost = 800
+	energy_cost = 700

code/modules/projectiles/boxes_magazines/ammo_boxes.dm

@@ -220,34 +220,34 @@
 	name = "ammo box (5.56mm HITP caseless)"
 	desc = "A box of 5.56mm HITP caseless ammo, a SolGov standard."
 	icon_state = "556mmHITPbox"
-	ammo_type = /obj/item/ammo_casing/caseless/c556mmHITP
+	ammo_type = /obj/item/ammo_casing/caseless/c556mm
 	max_ammo = 30
 
 /obj/item/ammo_box/c556mmHITP/surplus
 	name = "ammo box (5.56mm HITP caseless surplus)"
 	desc = "A box of low-quality 5.56mm HITP caseless ammo."
 	icon_state = "556mmHITPbox-surplus"
-	ammo_type = /obj/item/ammo_casing/caseless/c556mmHITP/surplus
+	ammo_type = /obj/item/ammo_casing/caseless/c556mm/surplus
 
 /obj/item/ammo_box/c556mmHITP/rubbershot
 	name = "ammo box (5.56mm HITP caseless rubbershot)"
 	desc = "A box of 5.56mm HITP caseless rubbershot ammo, designed to disable targets without causing serious damage."
 	icon_state = "556mmHITPbox-rubbershot"
-	ammo_type = /obj/item/ammo_casing/caseless/c556mmHITP/rubbershot
+	ammo_type = /obj/item/ammo_casing/caseless/c556mm/rubbershot
 	max_ammo = 30
 
 /obj/item/ammo_box/c556mmHITP/ap
 	name = "ammo box (5.56mm HITP caseless AP)"
 	desc = "A box of 5.56mm HITP caseless armor piercing ammo, designed to penetrate through armor at the cost of total damage."
 	icon_state = "556mmHITPbox-ap"
-	ammo_type = /obj/item/ammo_casing/caseless/c556mmHITP/ap
+	ammo_type = /obj/item/ammo_casing/caseless/c556mm/ap
 	max_ammo = 30
 
 /obj/item/ammo_box/c556mmHITP/hp
 	name = "ammo box (5.56mm HITP caseless HP)"
 	desc = "A box of 5.56mm HITP caseless hollow point ammo, designed to cause massive tissue damage at the cost of armor penetration."
 	icon_state = "556mmHITPbox-hp"
-	ammo_type = /obj/item/ammo_casing/caseless/c556mmHITP/hp
+	ammo_type = /obj/item/ammo_casing/caseless/c556mm/hp
 	max_ammo = 30
 
 /obj/item/ammo_box/a40mm
@@ -306,3 +306,12 @@
 	caliber = "9mm"
 	max_ammo = 4
 	custom_materials = list(/datum/material/iron = 20000)
+
+/obj/item/ammo_box/amagpellet_claris
+	name = "claris speed loader (ferromagnetic pellet)"
+	desc = "Designed to quickly reload the claris."
+	icon_state = "claris-sl"
+	ammo_type = /obj/item/ammo_casing/caseless/gauss
+	max_ammo = 22
+	multiple_sprites = AMMO_BOX_FULL_EMPTY
+	item_flags = NO_MAT_REDEMPTION

code/modules/projectiles/boxes_magazines/external/gauss.dm

@@ -5,3 +5,23 @@
 	caliber = "pellet"
 	max_ammo = 24
 	multiple_sprites = AMMO_BOX_FULL_EMPTY
+
+/obj/item/ammo_box/magazine/modelh
+	name = "model-h magazine (ferromagnetic slugs)"
+	icon_state = "smallmagmag"
+	ammo_type = /obj/item/ammo_casing/caseless/gauss/slug
+	caliber = "slug"
+	max_ammo = 10
+	multiple_sprites = AMMO_BOX_FULL_EMPTY
+
+/obj/item/ammo_box/magazine/gar
+	name = "gar tube magazine (ferromagnetic lances)"
+	icon_state = "gar-mag"
+	ammo_type = /obj/item/ammo_casing/caseless/gauss/lance
+	caliber = "lance"
+	max_ammo = 32
+	multiple_sprites = AMMO_BOX_FULL_EMPTY
+
+/obj/item/ammo_box/magazine/gar/update_icon()
+	. = ..()
+	icon_state = "gar-mag-[!!ammo_count()]"

code/modules/projectiles/boxes_magazines/external/smg.dm

@@ -100,10 +100,10 @@
 	icon_state = "drum45"
 
 /obj/item/ammo_box/magazine/pistol556mm
-	name = "handgun magazine (5.56mm HITP caseless)"
+	name = "handgun magazine (5.56mm caseless)"
 	icon_state = "5.56mmHITP-12" //ok i did it
-	ammo_type = /obj/item/ammo_casing/caseless/c556mmHITP
-	caliber = "5.56mm HITP caseless"
+	ammo_type = /obj/item/ammo_casing/caseless/c556mm
+	caliber = "5.56mm caseless"
 	max_ammo = 12
 
 /obj/item/ammo_box/magazine/pistol556mm/update_icon()

code/modules/projectiles/boxes_magazines/internal/gauss.dm

@@ -0,0 +1,5 @@
+/obj/item/ammo_box/magazine/internal/claris
+	name = "claris internal magazine"
+	ammo_type = /obj/item/ammo_casing/caseless/gauss
+	caliber = "pellet"
+	max_ammo = 22

code/modules/projectiles/guns/ballistic/gauss.dm

@@ -6,18 +6,81 @@
 	slot_flags = 0
 	mag_type = /obj/item/ammo_box/magazine/gauss
 	fire_sound = 'sound/weapons/gun/gauss/magrifle.ogg'
-	vary_fire_sound = TRUE
+
 	load_sound = 'sound/weapons/gun/gauss/rifle_reload.ogg'
 	can_suppress = FALSE
 	burst_size = 1
 	fire_delay = 3
 	spread = 0
-	recoil = 0.1
 	mag_display = TRUE
 	empty_indicator = TRUE
-	empty_alarm = TRUE
 	weapon_weight = WEAPON_MEDIUM
 	w_class = WEIGHT_CLASS_BULKY
 
 	charge_sections = 4
 	ammo_x_offset = 2
+
+/obj/item/gun/ballistic/automatic/powered/gauss/modelh
+	name = "Model H"
+	desc = "Standard issue pistol of the Solarian confederation. Its unique ability to fire slugs instead of pellets make it effective in taking down unarmored targets, but can be useless against armored ones. This also makes it drain battery very fast, be careful. Chambered in ferromagnetic slugs."
+	mag_type = /obj/item/ammo_box/magazine/modelh
+
+	icon_state = "model-h"
+	item_state = "model-h"
+	fire_sound = 'sound/weapons/gun/gauss/modelh.ogg'
+	load_sound = 'sound/weapons/gun/gauss/pistol_reload.ogg'
+
+	cell_type = /obj/item/stock_parts/cell/gun/solgov
+
+	slot_flags = ITEM_SLOT_BELT
+
+	w_class = WEIGHT_CLASS_SMALL
+	fire_delay = 0 //pistol
+
+	mag_display = FALSE
+	empty_indicator = FALSE
+
+
+/obj/item/gun/ballistic/automatic/powered/gauss/claris
+	name = "Claris"
+	desc = "A antiquated solarian rifle. Just as the founding Solarians intended. Chambered in ferromagnetic pellets."
+	mag_type = /obj/item/ammo_box/magazine/internal/claris
+
+	icon = 'icons/obj/guns/48x32guns.dmi'
+	icon_state = "claris"
+	item_state = "claris"
+	fire_sound = 'sound/weapons/gun/gauss/claris.ogg'
+	load_sound = 'sound/weapons/gun/gauss/sniper_reload.ogg'
+
+	cell_type = /obj/item/stock_parts/cell/gun/solgov
+	fire_delay = 2
+
+	bolt_type = BOLT_TYPE_NO_BOLT
+	internal_magazine = TRUE
+	casing_ejector = FALSE
+
+	mag_display = FALSE
+	empty_indicator = FALSE
+
+/obj/item/gun/ballistic/automatic/powered/gauss/gar
+	name = "Solar 'GAR' Assualt Rifle"
+	desc = "A unusally modern, for the solar confederation, assualt rifle. Fires ferromagnetic lances at alarming speeds in every sense of the word. Chambered in ferromagnetic lances."
+	mag_type = /obj/item/ammo_box/magazine/gar
+
+	icon = 'icons/obj/guns/48x32guns.dmi'
+	icon_state = "gar"
+	item_state = "gar"
+	fire_sound = 'sound/weapons/gun/gauss/gar.ogg'
+	load_sound = 'sound/weapons/gun/gauss/rifle_reload.ogg'
+
+	cell_type = /obj/item/stock_parts/cell/gun/solgov
+
+	burst_size = 2
+	fire_delay = 2
+	actions_types = list()
+
+	empty_indicator = FALSE
+
+/obj/item/gun/ballistic/automatic/powered/gauss/gar/ComponentInitialize()
+	. = ..()
+	AddComponent(/datum/component/automatic_fire, 0.2 SECONDS) //setiting this to 0.1 breaks auotfire, not sure why, so we use the standard fire rate but in 2 shot bursts to shoot 'faster'

code/modules/projectiles/guns/ballistic/launchers.dm

@@ -52,7 +52,7 @@
 	fire_sound = 'sound/weapons/gun/general/rocket_launch.ogg'
 	w_class = WEIGHT_CLASS_BULKY
 	can_suppress = FALSE
-	pin = /obj/item/firing_pin/implant/pindicate
+	pin = /obj/item/firing_pin
 	burst_size = 1
 	fire_delay = 0
 	casing_ejector = FALSE
@@ -97,7 +97,12 @@
 		sleep(20)
 		return OXYLOSS
 
+/obj/item/gun/ballistic/rocketlauncher/solgov
+	name = "Panzerfaust XII"
+	desc = "The standard recoiless rifle of the Solarian Confederation. Legend goes that every couple of decades, the bureaucracy changes a small part of the rifle, then bumps up the number. Chambered in rockets."
 
-
+	icon = 'icons/obj/guns/48x32guns.dmi'
+	icon_state = "panzerfaust"
+	item_state = "panzerfaust"
 
 

code/modules/projectiles/guns/ballistic/pistol.dm

@@ -171,12 +171,17 @@
 		. += "<span class='info'>Alt-click to use \the [src] vox hailer.</span>"
 
 /obj/item/gun/ballistic/automatic/pistol/solgov
-	name = "\improper SolGov M9C"
-	desc = "Known formally as the M9A5C, this is a compact caseless ammo handgun made for switching to when your primary runs empty on it's mag."
-	icon_state = "solm9c"
+	name = "\improper Pistole C"
+	desc = "A favorite of the Terran Regency, but despised by the Solarian bureaucracy. Was taken out of standard service several centruries ago, and is issued in low numbers in the military. However, it is popular with civillians. Chambered in 5.56mm caseless."
+	icon_state = "pistole-c"
 	weapon_weight = WEAPON_LIGHT
 	w_class = WEIGHT_CLASS_SMALL
 	mag_type = /obj/item/ammo_box/magazine/pistol556mm
+	fire_sound = 'sound/weapons/gun/pistol/pistolec.ogg'
+
+/obj/item/gun/ballistic/automatic/pistol/solgov/old
+	desc = "A favorite of the Terran Regency, but despised by the Solarian bureaucracy. Was taken out of standard service several centruries ago, and is issued in low numbers in the military. However, it is popular with civillians. Chambered in 5.56mm caseless."
+	icon_state = "pistole-c-old"
 
 /obj/item/gun/ballistic/automatic/pistol/tec9
 	name = "\improper TEC9 machine pistol"

code/modules/projectiles/guns/powered.dm

@@ -5,6 +5,7 @@
 	var/obj/item/stock_parts/cell/cell
 	var/cell_type = /obj/item/stock_parts/cell/gun
 	var/charge_sections = 3
+	var/empty_battery_sound = FALSE // play empty alarm if no battery
 
 	var/shaded_charge = FALSE //if this gun uses a stateful charge bar for more detail
 	var/automatic_charge_overlays = TRUE	//Do we handle overlays with base update_icon()?
@@ -44,7 +45,8 @@
 
 /obj/item/gun/ballistic/automatic/powered/shoot_live_shot(mob/living/user, pointblank = FALSE, mob/pbtarget, message = 1, stam_cost = 0)
 	var/obj/item/ammo_casing/caseless/gauss/shot = chambered
-	cell.use(shot.energy_cost)
+	if(shot?.energy_cost)
+		cell.use(shot.energy_cost)
 	return ..()
 
 /obj/item/gun/ballistic/automatic/powered/get_cell()

code/modules/projectiles/projectile/bullets.dm

@@ -1,9 +1,12 @@
 /obj/projectile/bullet
 	name = "bullet"
-	icon_state = "bullet"
+	icon_state = "gauss"
 	damage = 60
+	speed = 0.4
 	damage_type = BRUTE
 	nodamage = FALSE
+	light_system = MOVABLE_LIGHT
+	light_color = COLOR_VERY_SOFT_YELLOW
 	flag = "bullet"
 	hitsound_wall = "ricochet"
 	impact_effect_type = /obj/effect/temp_visual/impact_effect

code/modules/projectiles/projectile/bullets/gauss.dm

@@ -10,9 +10,12 @@
 	name = "ferromagnetic lance"
 	icon_state = "redtrac"
 	damage = 30
-	speed = 0.4
+	armour_penetration = 0
+	speed = 0.2
 
 /obj/projectile/bullet/gauss/slug
 	name = "ferromagnetic slug"
 	icon_state = "gauss-slug"
 	damage = 50
+	armour_penetration = -50
+	speed = 0.8

code/modules/projectiles/projectile/bullets/smg.dm

@@ -19,26 +19,26 @@
 	damage = 30
 	armour_penetration = 40
 
-/obj/projectile/bullet/c556mmHITP
+/obj/projectile/bullet/c556mm
 	name = "5.56mm HITP bullet"
 	damage = 20
 	armour_penetration = 0
 
-/obj/projectile/bullet/c556mmHITP_surplus
+/obj/projectile/bullet/c556mm_surplus
 	name = "5.56mm HITP surplus bullet"
 	damage = 15
 
-/obj/projectile/bullet/c556mmHITP_ap
+/obj/projectile/bullet/c556mm_ap
 	name = "5.56mm HITP AP bullet"
 	damage = 15
 	armour_penetration = 40
 
-/obj/projectile/bullet/c556mmHITP_hp
+/obj/projectile/bullet/c556mm_hp
 	name = "5.56mm HITP hollow-point bullet"
 	damage = 30
 	armour_penetration = -50
 
-/obj/projectile/bullet/c556mmHITP/rubbershot
+/obj/projectile/bullet/c556mm/rubbershot
 	name = "5.56mm HITP rubber bullet"
 	damage = 5
 	stamina = 20

shiptest.dme

@@ -2953,6 +2953,7 @@
 #include "code\modules\projectiles\boxes_magazines\internal\_cylinder.dm"
 #include "code\modules\projectiles\boxes_magazines\internal\_internal.dm"
 #include "code\modules\projectiles\boxes_magazines\internal\derringer.dm"
+#include "code\modules\projectiles\boxes_magazines\internal\gauss.dm"
 #include "code\modules\projectiles\boxes_magazines\internal\grenade.dm"
 #include "code\modules\projectiles\boxes_magazines\internal\misc.dm"
 #include "code\modules\projectiles\boxes_magazines\internal\revolver.dm"