guns and other things

code/modules/projectiles/ammunition/boxes_yw.dm

@@ -0,0 +1,59 @@
+/********m2024 .45********/
+
+/obj/item/ammo_magazine/c45m2024
+	name = "m2024 pistol magazine (.45)"
+	icon_state = "45"
+	icon = 'icons/obj/gun_yw.dmi'
+	mag_type = MAGAZINE
+	ammo_type = /obj/item/ammo_casing/c45
+	matter = list(DEFAULT_WALL_MATERIAL = 525) //metal costs are very roughly based around 1 .45 casing = 75 metal
+	caliber = ".45"
+	max_ammo = 7
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/c45m2024/empty
+	initial_ammo = 0
+
+/obj/item/ammo_magazine/c45m2024/rubber
+	name = "m2024 magazine (.45 rubber)"
+	ammo_type = /obj/item/ammo_casing/c45r
+
+/obj/item/ammo_magazine/c45m2024/practice
+	name = "m2024 magazine (.45 practice)"
+	ammo_type = /obj/item/ammo_casing/c45p
+
+/obj/item/ammo_magazine/c45m2024/flash
+	name = "m2024 magazine (.45 flash)"
+	ammo_type = /obj/item/ammo_casing/c45f
+
+/obj/item/ammo_magazine/c45m2024/ap
+	name = "m2024 magazine (.45 AP)"
+	ammo_type = /obj/item/ammo_casing/c45ap
+
+
+/******** 9mm glock ********/
+/obj/item/ammo_magazine/gl9mm
+	name = "glock magazine (9mm)"
+	icon_state = "glock-mag"
+	icon = 'icons/obj/gun_yw.dmi'
+	origin_tech = list(TECH_COMBAT = 2)
+	mag_type = MAGAZINE
+	matter = list(DEFAULT_WALL_MATERIAL = 480)
+	caliber = "9mm"
+	ammo_type = /obj/item/ammo_casing/c9mm
+	max_ammo = 17
+	multiple_sprites = 0
+
+/obj/item/ammo_magazine/gl9mm/empty
+	initial_ammo = 0
+
+/obj/item/ammo_magazine/gl9mm/flash
+	ammo_type = /obj/item/ammo_casing/c9mmf
+
+/obj/item/ammo_magazine/gl9mm/rubber
+	name = "glock magazine (9mm rubber)"
+	ammo_type = /obj/item/ammo_casing/c9mmr
+
+/obj/item/ammo_magazine/gl9mm/practice
+	name = "glock magazine (9mm practice)"
+	ammo_type = /obj/item/ammo_casing/c9mmp

code/modules/projectiles/guns/energy/nuclear_yw.dm

@@ -1,7 +1,7 @@
-/obj/item/weapon/gun/energy/las
+/obj/item/weapon/gun/energy/sf2000
 	name = "SF 2000"
 	desc = "A oddly shaped red colored energy gun, can fire both stun and lethal lasers"
-	icon_state = "lasstun"
+	icon_state = "lasgunstun"
 	icon = 'icons/obj/gun_yw.dmi'
 	item_state = null	//so the human update icon uses the icon_state instead.
 	fire_sound = 'sound/weapons/Taser.ogg'
@@ -9,9 +9,9 @@
 
 	projectile_type = /obj/item/projectile/beam/stun
 	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
-	modifystate = "energystun"
+	modifystate = "lasgunstun"
 
 	firemodes = list(
-		list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun/weak, modifystate="lasstun", fire_sound='sound/weapons/Taser.ogg', charge_cost = 240),
-		list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="laskill", fire_sound='sound/weapons/Laser.ogg', charge_cost = 480),
+		list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun/weak, modifystate="lasgunstun", fire_sound='sound/weapons/Taser.ogg', charge_cost = 240),
+		list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="lasgunkill", fire_sound='sound/weapons/Laser.ogg', charge_cost = 480),
 		)

code/modules/projectiles/guns/projectile/pistol_yw.dm

@@ -1,5 +1,4 @@
 /******GLOCK******/
-/*****************/
 /obj/item/weapon/gun/projectile/automatic/glock
 	name = "Glock G18"
 	desc = "A automatic handgun that uses .9mm rounds."
@@ -26,7 +25,6 @@
 
 
 /*******PPK*******/
-/*****************/
 /obj/item/weapon/gun/projectile/ppk
 	name = "PPK"
 	desc = "A handgun that uses .9mm rounds."
@@ -46,4 +44,23 @@
 	else
 		icon_state = "[initial(icon_state)]-empty"
 
-/**/
+
+/*******M2024*******/
+/obj/item/weapon/gun/projectile/m2024
+	name = "Custom M2024"
+	desc = "Customized model of old yet reliable sol .45 handgun with the name 'M2024'. Used to be popular, still appreciated for it's effectiveness."
+	icon_state = "m2024"
+	item_state = "m2024"
+	icon = 'icons/obj/gun_yw.dmi'
+	caliber = ".45"
+	load_method = MAGAZINE
+	fire_sound = 'sound/weapons/semiauto.ogg'
+	magazine_type = /obj/item/ammo_magazine/c45m2024
+	allowed_magazines = list(/obj/item/ammo_magazine/c45m2024,/obj/item/ammo_magazine/c45m)
+
+/obj/item/weapon/gun/projectile/m2024/update_icon()
+	..()
+	if(ammo_magazine)
+		icon_state = "[initial(icon_state)]"
+	else
+		icon_state = "[initial(icon_state)]-empty"

code/modules/projectiles/guns/projectile/revolver_yw.dm

@@ -0,0 +1,6 @@
+/obj/item/weapon/gun/projectile/revolver/nova
+	name = "Nova"
+	desc = "Heavily modified revolver, with alas only 6 round chamber but fiery firepower of 357 calibre. Make it count. Uses .357 rounds." // Yes I'm serious. -Spades
+	icon_state = "nova"
+	icon = 'icons/obj/gun_yw.dmi'
+	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)