Modification of .gitignore to include admins.txt. Hopefully.`

Added myself to admins.txt for testing. Merge branch 'srsbsns' Fucking finally figuring out how to make admins.txt be ignored. Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt stuff Merge branch 'master' of https://github.com/tgstation/-tg-station Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt Merge branch 'master' of https://github.com/tgstation/-tg-station Merge branch 'master' of https://github.com/tgstation/-tg-station Merge branch 'master' of https://github.com/tgstation/-tg-station latest setting for tgstation.dme deeply do I loathe these files Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt God I hate gitignore Merge branch 'master' of https://github.com/tgstation/-tg-station Modification of .gitignore to include admins.txt. Hopefully.` Added myself to admins.txt for testing. Merge branch 'srsbsns' Fucking finally figuring out how to make admins.txt be ignored. Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt stuff Merge branch 'master' of https://github.com/tgstation/-tg-station Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt Merge branch 'master' of https://github.com/tgstation/-tg-station Merge branch 'master' of https://github.com/tgstation/-tg-station Merge branch 'master' of https://github.com/tgstation/-tg-station latest setting for tgstation.dme deeply do I loathe these files Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt God I hate gitignore Merge branch 'master' of https://github.com/tgstation/-tg-station Modification of .gitignore to include admins.txt. Hopefully.` Added myself to admins.txt for testing. Merge branch 'srsbsns' Fucking finally figuring out how to make admins.txt be ignored. Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt stuff Merge branch 'master' of https://github.com/tgstation/-tg-station Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt Merge branch 'master' of https://github.com/tgstation/-tg-station Merge branch 'master' of https://github.com/tgstation/-tg-station Merge branch 'master' of https://github.com/tgstation/-tg-station latest setting for tgstation.dme deeply do I loathe these files Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt God I hate gitignore Merge branch 'master' of https://github.com/tgstation/-tg-station Merge remote-tracking branch 'remotes/origin/srsbsns-improvedprojectiles' into srsbsns-improvedprojectiles Conflicts: config/admins.txt data/investigate/singulo.html I don't what I'm doing Massive overhaul to automatic gun functionality, intended primarily to allow partially-filled magazines to be released. Now it compiles and doesn't throw runtimes! Also chambering rounds works right! Unfortunately the contents still need to be looked at, the Russian Revolver isn't working, and the Bartender's shotgun is just a nightmare. Also you still can't eject mags. Mags eject, most gun work. Shotguns still have a problem with reloading and chambering. Russian Revolver is a bitch. Heavy finalizing touches. Fixed references to changed trees. Added icon_states for some magazines. Fixed revolver glitches and subtyped double-barreled shotguns to revolvers to fix its glitches. Made bullets and spent shells more obvious via graphical changes. Probably did some other things but I can't think of what they'd be. Sprite tweaks for final preparations for pull request. final FINAL finalizations. Adding full paths to overwritten procs for simplicity's sake. Fixing damaged .gitignore and config/admins.txt. Finalization for pull preparation. Clean up some descs, eliminate data folder.
2025-12-10 01:34:01 +00:00 · 2013-10-30 03:00:03 -07:00
parent a501cefb32
commit 19e51caef0
41 changed files with 846 additions and 620 deletions
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -94,13 +94,13 @@ var/list/uplink_items = list()
 /datum/uplink_item/dangerous/revolver
 	name = "Full Revolver"
 	desc = "The syndicate revolver is a traditional handgun that fires .357 Magnum cartridges and has 7 chambers."
-	item = /obj/item/weapon/gun/projectile
+	item = /obj/item/weapon/gun/projectile/revolver
 	cost = 6

 /datum/uplink_item/dangerous/ammo
 	name = "Ammo-357"
 	desc = "A box that contains seven additional rounds for the revolver, made using an automatic lathe."
-	item = /obj/item/ammo_magazine/a357
+	item = /obj/item/ammo_box/a357
 	cost = 2

 /datum/uplink_item/dangerous/crossbow
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -204,8 +204,8 @@
 	synd_mob.equip_to_slot_or_del(new /obj/item/weapon/card/id/syndicate(synd_mob), slot_wear_id)
 	if(synd_mob.backbag == 2) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(synd_mob), slot_back)
 	if(synd_mob.backbag == 3) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(synd_mob), slot_back)
-	synd_mob.equip_to_slot_or_del(new /obj/item/ammo_magazine/a12mm(synd_mob), slot_in_backpack)
-	synd_mob.equip_to_slot_or_del(new /obj/item/ammo_magazine/a12mm(synd_mob), slot_in_backpack)
+	synd_mob.equip_to_slot_or_del(new /obj/item/ammo_box/magazine/m12mm(synd_mob), slot_in_backpack)
+	synd_mob.equip_to_slot_or_del(new /obj/item/ammo_box/magazine/m12mm(synd_mob), slot_in_backpack)
 	synd_mob.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/pill/cyanide(synd_mob), slot_in_backpack)
 	synd_mob.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/c20r(synd_mob), slot_belt)
 	synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(synd_mob.back), slot_in_backpack)
--- a/code/game/gamemodes/wizard/rightandwrong.dm
+++ b/code/game/gamemodes/wizard/rightandwrong.dm
@@ -27,21 +27,21 @@
 			if("laser")
 				new /obj/item/weapon/gun/energy/laser(get_turf(H))
 			if("revolver")
-				new /obj/item/weapon/gun/projectile(get_turf(H))
+				new /obj/item/weapon/gun/projectile/revolver(get_turf(H))
 			if("detective")
-				new /obj/item/weapon/gun/projectile/detective(get_turf(H))
+				new /obj/item/weapon/gun/projectile/revolver/detective(get_turf(H))
 			if("smg")
 				new /obj/item/weapon/gun/projectile/automatic/c20r(get_turf(H))
 			if("nuclear")
 				new /obj/item/weapon/gun/energy/gun/nuclear(get_turf(H))
 			if("deagle")
-				new /obj/item/weapon/gun/projectile/deagle/camo(get_turf(H))
+				new /obj/item/weapon/gun/projectile/automatic/deagle/camo(get_turf(H))
 			if("gyrojet")
-				new /obj/item/weapon/gun/projectile/gyropistol(get_turf(H))
+				new /obj/item/weapon/gun/projectile/automatic/gyropistol(get_turf(H))
 			if("pulse")
 				new /obj/item/weapon/gun/energy/pulse_rifle(get_turf(H))
 			if("silenced")
-				new /obj/item/weapon/gun/projectile/pistol(get_turf(H))
+				new /obj/item/weapon/gun/projectile/automatic/pistol(get_turf(H))
 				new /obj/item/weapon/silencer(get_turf(H))
 			if("cannon")
 				new /obj/item/weapon/gun/energy/lasercannon(get_turf(H))
@@ -52,7 +52,7 @@
 			if("combatshotgun")
 				new /obj/item/weapon/gun/projectile/shotgun/pump/combat(get_turf(H))
 			if("mateba")
-				new /obj/item/weapon/gun/projectile/mateba(get_turf(H))
+				new /obj/item/weapon/gun/projectile/revolver/mateba(get_turf(H))
 			if("smg")
 				new /obj/item/weapon/gun/projectile/automatic(get_turf(H))
 			if("uzi")
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -34,7 +34,7 @@ var/global/list/autolathe_recipes = list( \
 		new /obj/item/weapon/reagent_containers/glass/beaker/large(), \
 		new /obj/item/ammo_casing/shotgun/blank(), \
 		new /obj/item/ammo_casing/shotgun/beanbag(), \
-		new /obj/item/ammo_magazine/c38(), \
+		new /obj/item/ammo_box/c38(), \
 		new /obj/item/device/taperecorder/empty(), \
 		new /obj/item/device/tape(), \
 		new /obj/item/device/assembly/igniter(), \
@@ -55,7 +55,7 @@ var/global/list/autolathe_recipes_hidden = list( \
 		new /obj/item/device/radio/electropack(), \
 		new /obj/item/weapon/weldingtool/largetank(), \
 		new /obj/item/weapon/handcuffs(), \
-		new /obj/item/ammo_magazine/a357(), \
+		new /obj/item/ammo_box/a357(), \
 		new /obj/item/ammo_casing/shotgun(), \
 		new /obj/item/ammo_casing/shotgun/dart(), \
 		/* new /obj/item/weapon/shield/riot(), */ \
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -524,10 +524,10 @@
 			if(allowed(perp) && !lasercolor) //if the perp has security access, return 0
 				return 0

-			if((istype(perp.l_hand, /obj/item/weapon/gun) && !istype(perp.l_hand, /obj/item/weapon/gun/projectile/shotgun/doublebarrel)) || istype(perp.l_hand, /obj/item/weapon/melee/baton))
+			if((istype(perp.l_hand, /obj/item/weapon/gun) && !istype(perp.l_hand, /obj/item/weapon/gun/projectile/revolver/doublebarrel)) || istype(perp.l_hand, /obj/item/weapon/melee/baton))
 				threatcount += 4

-			if((istype(perp.r_hand, /obj/item/weapon/gun) && !istype(perp.r_hand, /obj/item/weapon/gun/projectile/shotgun/doublebarrel)) || istype(perp.r_hand, /obj/item/weapon/melee/baton))
+			if((istype(perp.r_hand, /obj/item/weapon/gun) && !istype(perp.r_hand, /obj/item/weapon/gun/projectile/revolver/doublebarrel)) || istype(perp.r_hand, /obj/item/weapon/melee/baton))
 				threatcount += 4

 			if(istype(perp.belt, /obj/item/weapon/gun) || istype(perp.belt, /obj/item/weapon/melee/baton))
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -110,7 +110,7 @@
 		"/obj/item/device/flash",
 		"/obj/item/clothing/glasses",
 		"/obj/item/ammo_casing/shotgun",
-		"/obj/item/ammo_magazine",
+		"/obj/item/ammo_box",
 		"/obj/item/weapon/reagent_containers/food/snacks/donut/normal",
 		"/obj/item/weapon/reagent_containers/food/snacks/donut/jelly"
 		)
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -24,8 +24,8 @@
 				return

 			if("guns")
-				new /obj/item/weapon/gun/projectile(src)
-				new /obj/item/ammo_magazine/a357(src)
+				new /obj/item/weapon/gun/projectile/revolver(src)
+				new /obj/item/ammo_box/a357(src)
 				new /obj/item/weapon/card/emag(src)
 				new /obj/item/weapon/plastique(src)
 				return
@@ -59,7 +59,7 @@
 				return

 			if("smoothoperator")
-				new /obj/item/weapon/gun/projectile/pistol(src)
+				new /obj/item/weapon/gun/projectile/automatic/pistol(src)
 				new /obj/item/weapon/silencer(src)
 				new /obj/item/weapon/soap/syndie(src)
 				new /obj/item/weapon/storage/bag/trash(src)
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -216,9 +216,9 @@
 		new /obj/item/device/radio/headset/headset_sec(src)
 		new /obj/item/device/detective_scanner(src)
 		new /obj/item/clothing/suit/armor/vest/det_suit(src)
-		new /obj/item/ammo_magazine/c38(src)
-		new /obj/item/ammo_magazine/c38(src)
-		new /obj/item/weapon/gun/projectile/detective(src)
+		new /obj/item/ammo_box/c38(src)
+		new /obj/item/ammo_box/c38(src)
+		new /obj/item/weapon/gun/projectile/revolver/detective(src)
 		return

 /obj/structure/closet/secure_closet/detective/update_icon()
--- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
@@ -30,11 +30,11 @@
 /obj/structure/closet/syndicate/nuclear/New()
 	..()
 	sleep(2)
-	new /obj/item/ammo_magazine/a12mm(src)
-	new /obj/item/ammo_magazine/a12mm(src)
-	new /obj/item/ammo_magazine/a12mm(src)
-	new /obj/item/ammo_magazine/a12mm(src)
-	new /obj/item/ammo_magazine/a12mm(src)
+	new /obj/item/ammo_box/magazine/m12mm(src)
+	new /obj/item/ammo_box/magazine/m12mm(src)
+	new /obj/item/ammo_box/magazine/m12mm(src)
+	new /obj/item/ammo_box/magazine/m12mm(src)
+	new /obj/item/ammo_box/magazine/m12mm(src)
 	new /obj/item/weapon/storage/box/handcuffs(src)
 	new /obj/item/weapon/storage/box/flashbangs(src)
 	new /obj/item/weapon/gun/energy/gun(src)
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -692,7 +692,7 @@ var/global/list/g_fancy_list_of_safe_types = null
 			M.equip_to_slot_or_del(new /obj/item/weapon/cloaking_device(M), slot_r_store)

 			M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile(M), slot_r_hand)
-			M.equip_to_slot_or_del(new /obj/item/ammo_magazine/a357(M), slot_l_store)
+			M.equip_to_slot_or_del(new /obj/item/ammo_box/a357(M), slot_l_store)

 		if ("tournament chef") //Steven Seagal FTW
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chef(M), slot_w_uniform)
@@ -808,8 +808,8 @@ var/global/list/g_fancy_list_of_safe_types = null
 			for(var/i=3, i>0, i--)
 				sec_briefcase.contents += new /obj/item/weapon/spacecash/c1000
 			sec_briefcase.contents += new /obj/item/weapon/gun/energy/crossbow
-			sec_briefcase.contents += new /obj/item/weapon/gun/projectile/mateba
-			sec_briefcase.contents += new /obj/item/ammo_magazine/a357
+			sec_briefcase.contents += new /obj/item/weapon/gun/projectile/revolver/mateba
+			sec_briefcase.contents += new /obj/item/ammo_box/a357
 			sec_briefcase.contents += new /obj/item/weapon/plastique
 			M.equip_to_slot_or_del(sec_briefcase, slot_l_hand)

@@ -844,7 +844,7 @@ var/global/list/g_fancy_list_of_safe_types = null
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(M), slot_back)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box(M), slot_in_backpack)

-			M.equip_to_slot_or_del(new /obj/item/ammo_magazine/a357(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/ammo_box/a357(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/regular(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/flashbangs(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/device/flashlight(M), slot_in_backpack)
@@ -854,7 +854,7 @@ var/global/list/g_fancy_list_of_safe_types = null
 			M.equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword(M), slot_l_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/grenade/flashbang(M), slot_r_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen(M), slot_s_store)
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/mateba(M), slot_belt)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver/mateba(M), slot_belt)

 			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle(M), slot_r_hand)

@@ -910,9 +910,9 @@ var/global/list/g_fancy_list_of_safe_types = null
 			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses)
 			M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba(M), slot_wear_mask)
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/centhat(M), slot_head)
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/mateba(M), slot_belt)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver/mateba(M), slot_belt)
 			M.equip_to_slot_or_del(new /obj/item/weapon/lighter/zippo(M), slot_r_store)
-			M.equip_to_slot_or_del(new /obj/item/ammo_magazine/a357(M), slot_l_store)
+			M.equip_to_slot_or_del(new /obj/item/ammo_box/a357(M), slot_l_store)

 			var/obj/item/weapon/card/id/W = new(M)
 			W.name = "[M.real_name]'s ID Card (Centcom Commander)"
@@ -988,7 +988,7 @@ var/global/list/g_fancy_list_of_safe_types = null
 			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses)
 			M.equip_to_slot_or_del(new /obj/item/clothing/suit/hgpirate(M), slot_wear_suit)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back)
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/mateba(M), slot_belt)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver/mateba(M), slot_belt)
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/soviet(M), slot_w_uniform)
 			var/obj/item/weapon/card/id/W = new(M)
 			W.name = "[M.real_name]'s ID Card (Admiral)"
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -19,7 +19,7 @@
 	permeability_coefficient = 0.02
 	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS
-	allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
+	allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
 	slowdown = 1.5
 	armor = list(melee = 65, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50)
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
@@ -93,7 +93,7 @@
 	icon_state = "pirate"
 	item_state = "pirate"
 	w_class = 3
-	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
+	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
 	slowdown = 0
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)

--- a/code/modules/clothing/spacesuits/ninja.dm
+++ b/code/modules/clothing/spacesuits/ninja.dm
@@ -12,7 +12,7 @@
 	desc = "A unique, vaccum-proof suit of nano-enhanced armor designed specifically for Spider Clan assassins."
 	icon_state = "s-ninja"
 	item_state = "s-ninja_suit"
-	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/cell)
+	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/cell)
 	slowdown = 0
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)

--- a/code/modules/clothing/spacesuits/rig.dm
+++ b/code/modules/clothing/spacesuits/rig.dm
@@ -121,7 +121,7 @@
 	slowdown = 1
 	w_class = 3
 	armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50)
-	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
+	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)

 //Wizard Rig
 /obj/item/clothing/head/helmet/space/rig/wizard
@@ -181,5 +181,5 @@
 	name = "security hardsuit"
 	desc = "A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor."
 	item_state = "sec_hardsuit"
-	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank, /obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank, /obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
 	armor = list(melee = 30, bullet = 15, laser = 30,energy = 10, bomb = 10, bio = 100, rad = 50)
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -13,7 +13,7 @@
 	item_state = "space_suit_syndicate"
 	desc = "Has a tag on it: Totally not property of of a hostile corporation, honest!"
 	w_class = 3
-	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
+	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
 	slowdown = 1
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)

--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -1,6 +1,6 @@

 /obj/item/clothing/suit/armor
-	allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
+	allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
 	body_parts_covered = CHEST
 	flags = FPRINT | TABLEPASS

@@ -84,7 +84,7 @@
 	permeability_coefficient = 0.01
 	flags = FPRINT | TABLEPASS
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
-	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
+	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
 	slowdown = 1
 	armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 0, rad = 0)
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
@@ -106,7 +106,7 @@
 	name = "armor"
 	desc = "An armored vest with a detective's badge on it."
 	icon_state = "detective-armor"
-	allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
+	allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)



--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -73,7 +73,7 @@
 	item_state = "det_suit"
 	blood_overlay_type = "coat"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-	allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
+	allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
 	armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
 	cold_protection = CHEST|GROIN|LEGS|ARMS
 	heat_protection = CHEST|GROIN|LEGS|ARMS
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -330,7 +330,7 @@ proc/check_panel(mob/M)
 		del(O)
 	return

-var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/item/ammo_magazine/a357,\
+var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/item/ammo_box/a357,\
 	/obj/item/weapon/gun/energy/crossbow, /obj/item/weapon/melee/energy/sword,\
 	/obj/item/weapon/storage/box/syndicate, /obj/item/weapon/storage/box/emps,\
 	/obj/item/weapon/cartridge/syndicate, /obj/item/clothing/under/chameleon,\
--- a/code/modules/mob/living/simple_animal/hostile/russian.dm
+++ b/code/modules/mob/living/simple_animal/hostile/russian.dm
@@ -39,7 +39,7 @@
 	icon_state = "russianranged"
 	icon_living = "russianranged"
 	corpse = /obj/effect/landmark/mobcorpse/russian/ranged
-	weapon1 = /obj/item/weapon/gun/projectile/mateba
+	weapon1 = /obj/item/weapon/gun/projectile/revolver/mateba
 	ranged = 1
 	projectiletype = /obj/item/projectile/bullet
 	projectilesound = 'sound/weapons/Gunshot.ogg'
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -7,23 +7,29 @@
 	slot_flags = SLOT_BELT
 	throwforce = 1
 	w_class = 1.0
-	var/caliber = ""							//Which kind of guns it can be loaded into
-	var/projectile_type = ""//The bullet type to create when New() is called
+	var/caliber = null							//Which kind of guns it can be loaded into
+	var/projectile_type = null					//The bullet type to create when New() is called
 	var/obj/item/projectile/BB = null 			//The loaded bullet


-	New()
-		..()
-		if(projectile_type)
-			BB = new projectile_type(src)
-		pixel_x = rand(-10.0, 10)
-		pixel_y = rand(-10.0, 10)
-		dir = pick(cardinal)
+/obj/item/ammo_casing/New()
+	..()
+	if(projectile_type)
+		BB = new projectile_type(src)
+	pixel_x = rand(-10.0, 10)
+	pixel_y = rand(-10.0, 10)
+	dir = pick(alldirs)
+	update_icon()
+
+/obj/item/ammo_casing/update_icon()
+	..()
+	icon_state = "[initial(icon_state)][BB ? "-live" : ""]"
+	desc = "[initial(desc)][BB ? "" : " This one is spent"]"



 //Boxes of ammo
-/obj/item/ammo_magazine
+/obj/item/ammo_box
 	name = "ammo box (.357)"
 	desc = "A box of ammo"
 	icon_state = "357"
@@ -37,18 +43,65 @@
 	throw_speed = 4
 	throw_range = 10
 	var/list/stored_ammo = list()
-	var/ammo_type = "/obj/item/ammo_casing"
+	var/ammo_type = /obj/item/ammo_casing
 	var/max_ammo = 7
 	var/multiple_sprites = 0
+	var/caliber


-	New()
-		for(var/i = 1, i <= max_ammo, i++)
-			stored_ammo += new ammo_type(src)
+/obj/item/ammo_box/New()
+	for(var/i = 1, i <= max_ammo, i++)
+		stored_ammo += new ammo_type(src)
+	update_icon()
+
+/obj/item/ammo_box/proc/get_round(var/keep = 0)
+	if (!stored_ammo.len)
+		return null
+	else
+		var/b = stored_ammo[stored_ammo.len]
+		stored_ammo -= b
+		if (keep)
+			stored_ammo.Insert(1,b)
+		return b
+
+/obj/item/ammo_box/proc/give_round(var/obj/item/ammo_casing/r)
+	var/obj/item/ammo_casing/rb = r
+	if (rb)
+		if (stored_ammo.len < max_ammo && rb.caliber == caliber)
+			stored_ammo += rb
+			rb.loc = src
+			return 1
+	return 0
+
+/obj/item/ammo_box/attackby(var/obj/item/A as obj, mob/user as mob)
+	var/num_loaded = 0
+	if(istype(A, /obj/item/ammo_box))
+		var/obj/item/ammo_box/AM = A
+		for(var/obj/item/ammo_casing/AC in AM.stored_ammo)
+			if(give_round(AC))
+				AM.stored_ammo -= AC
+				num_loaded++
+			else
+				break
+	if(istype(A, /obj/item/ammo_casing))
+		var/obj/item/ammo_casing/AC = A
+		if(give_round(AC))
+			user.drop_item()
+			AC.loc = src
+			num_loaded++
+	if(num_loaded)
+		user << "<span class='notice'>You load [num_loaded] shell\s into \the [src]!</span>"
+		A.update_icon()
 		update_icon()

-
-	update_icon()
-		if(multiple_sprites)
+/obj/item/ammo_box/update_icon()
+	switch(multiple_sprites)
+		if(1)
 			icon_state = "[initial(icon_state)]-[stored_ammo.len]"
-		desc = "There are [stored_ammo.len] shell\s left!"
+		if(2)
+			icon_state = "[initial(icon_state)]-[stored_ammo.len ? "[max_ammo]" : "0"]"
+	desc = "There are [stored_ammo.len] shell\s left!"
+
+//Behavior for magazines
+/obj/item/ammo_box/magazine/proc/ammo_count()
+	return stored_ammo.len
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -1,136 +1,61 @@
-/obj/item/ammo_magazine/a357
+/obj/item/ammo_box/a357
 	name = "ammo box (.357)"
 	desc = "A box of .357 ammo"
 	icon_state = "357"
-	ammo_type = "/obj/item/ammo_casing/a357"
+	ammo_type = /obj/item/ammo_casing/a357
 	max_ammo = 7
 	multiple_sprites = 1

-/obj/item/ammo_magazine/c38
+/obj/item/ammo_box/c38
 	name = "speed loader (.38)"
 	icon_state = "38"
-	ammo_type = "/obj/item/ammo_casing/c38"
+	ammo_type = /obj/item/ammo_casing/c38
 	max_ammo = 6
 	multiple_sprites = 1



-/obj/item/ammo_magazine/a418
+/obj/item/ammo_box/a418
 	name = "ammo box (.418)"
 	icon_state = "418"
-	ammo_type = "/obj/item/ammo_casing/a418"
+	ammo_type = /obj/item/ammo_casing/a418
 	max_ammo = 7
 	multiple_sprites = 1



-/obj/item/ammo_magazine/a666
+/obj/item/ammo_box/a666
 	name = "ammo box (.666)"
 	icon_state = "666"
-	ammo_type = "/obj/item/ammo_casing/a666"
+	ammo_type = /obj/item/ammo_casing/a666
 	max_ammo = 4
 	multiple_sprites = 1

-
-/obj/item/ammo_magazine/mc9mm
-	name = "magazine (9mm)"
-	icon_state = "9x19p"
-	origin_tech = "combat=2"
-	ammo_type = "/obj/item/ammo_casing/c9mm"
-	max_ammo = 8
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/mc9mm/empty
-	max_ammo = 0
-
-/obj/item/ammo_magazine/c9mm
+/obj/item/ammo_box/c9mm
 	name = "Ammunition Box (9mm)"
 	icon_state = "9mm"
 	origin_tech = "combat=2"
-	ammo_type = "/obj/item/ammo_casing/c9mm"
+	ammo_type = /obj/item/ammo_casing/c9mm
 	max_ammo = 30

-/obj/item/ammo_magazine/mc10mm
-	name = "magazine (10mm)"
-	icon_state = "9x19p"
-	origin_tech = "combat=2"
-	ammo_type = "/obj/item/ammo_casing/c10mm"
-	max_ammo = 8
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/mc10mm/empty
-	max_ammo = 0
-
-/obj/item/ammo_magazine/c10mm
+/obj/item/ammo_box/c10mm
 	name = "Ammunition Box (10mm)"
 	icon_state = "9mm"
 	origin_tech = "combat=2"
-	ammo_type = "/obj/item/ammo_casing/c10mm"
+	ammo_type = /obj/item/ammo_casing/c10mm
 	max_ammo = 30


-/obj/item/ammo_magazine/c45
+/obj/item/ammo_box/c45
 	name = "Ammunition Box (.45)"
 	icon_state = "9mm"
 	origin_tech = "combat=2"
-	ammo_type = "/obj/item/ammo_casing/c45"
+	ammo_type = /obj/item/ammo_casing/c45
 	max_ammo = 30

-
-
-/obj/item/ammo_magazine/a12mm
-	name = "magazine (12mm)"
-	icon_state = "12mm"
+/obj/item/ammo_box/a12mm
+	name = "Ammunition Box (12mm)"
+	icon_state = "9mm"
 	origin_tech = "combat=2"
-	ammo_type = "/obj/item/ammo_casing/a12mm"
-	max_ammo = 20
-	multiple_sprites = 1
-
-
-/obj/item/ammo_magazine/a12mm/empty
-	name = "magazine (12mm)"
-	icon_state = "12mm"
-	ammo_type = "/obj/item/ammo_casing/12mm"
-	max_ammo = 0
-
-/obj/item/ammo_magazine/a50
-	name = "magazine (.50)"
-	icon_state = "50ae"
-	origin_tech = "combat=2"
-	ammo_type = "/obj/item/ammo_casing/a50"
-	max_ammo = 7
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/a50/empty
-	name = "magazine (.50)"
-	icon_state = "50ae"
-	ammo_type = "/obj/item/ammo_casing/a50"
-	max_ammo = 0
-
-/obj/item/ammo_magazine/a75
-	name = "ammo magazine (.75)"
-	icon_state = "75"
-	ammo_type = "/obj/item/ammo_casing/a75"
-	multiple_sprites = 1
-	max_ammo = 8
-
-/obj/item/ammo_magazine/a75/empty
-	name = "ammo magazine (.75)"
-	icon_state = "75"
-	ammo_type = "/obj/item/ammo_casing/a75"
-	max_ammo = 0
-
-/obj/item/ammo_magazine/a762
-	name = "magazine (a762)"
-	icon_state = "a762"
-	origin_tech = "combat=2"
-	ammo_type = "/obj/item/ammo_casing/a762"
-	max_ammo = 50
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/a762/empty
-	name = "magazine (a762)"
-	icon_state = "a762"
-	ammo_type = "/obj/item/ammo_casing/a762"
-	max_ammo = 0
-	multiple_sprites = 1
+	ammo_type = /obj/item/ammo_casing/a12mm
+	max_ammo = 30
--- a/code/modules/projectiles/ammunition/bullets.dm
+++ b/code/modules/projectiles/ammunition/bullets.dm
@@ -1,59 +1,59 @@
 /obj/item/ammo_casing/a357
 	desc = "A .357 bullet casing."
 	caliber = "357"
-	projectile_type = "/obj/item/projectile/bullet"
+	projectile_type = /obj/item/projectile/bullet

 /obj/item/ammo_casing/a50
 	desc = "A .50AE bullet casing."
 	caliber = ".50"
-	projectile_type = "/obj/item/projectile/bullet"
+	projectile_type = /obj/item/projectile/bullet

 /obj/item/ammo_casing/a418
 	desc = "A .418 bullet casing."
 	caliber = "357"
-	projectile_type = "/obj/item/projectile/bullet/suffocationbullet"
+	projectile_type = /obj/item/projectile/bullet/suffocationbullet


 /obj/item/ammo_casing/a75
 	desc = "A .75 bullet casing."
 	caliber = "75"
-	projectile_type = "/obj/item/projectile/bullet/gyro"
+	projectile_type = /obj/item/projectile/bullet/gyro


 /obj/item/ammo_casing/a666
 	desc = "A .666 bullet casing."
 	caliber = "357"
-	projectile_type = "/obj/item/projectile/bullet/cyanideround"
+	projectile_type = /obj/item/projectile/bullet/cyanideround


 /obj/item/ammo_casing/c38
 	desc = "A .38 bullet casing."
 	caliber = "38"
-	projectile_type = "/obj/item/projectile/bullet/weakbullet"
+	projectile_type = /obj/item/projectile/bullet/weakbullet


 /obj/item/ammo_casing/c10mm
 	desc = "A 10mm bullet casing."
 	caliber = "10mm"
-	projectile_type = "/obj/item/projectile/bullet/midbullet3"
+	projectile_type = /obj/item/projectile/bullet/midbullet3


 /obj/item/ammo_casing/c9mm
 	desc = "A 9mm bullet casing."
 	caliber = "9mm"
-	projectile_type = "/obj/item/projectile/bullet/midbullet2"
+	projectile_type = /obj/item/projectile/bullet/midbullet2


 /obj/item/ammo_casing/c45
 	desc = "A .45 bullet casing."
 	caliber = ".45"
-	projectile_type = "/obj/item/projectile/bullet/midbullet"
+	projectile_type = /obj/item/projectile/bullet/midbullet


 /obj/item/ammo_casing/a12mm
 	desc = "A 12mm bullet casing."
 	caliber = "12mm"
-	projectile_type = "/obj/item/projectile/bullet/midbullet"
+	projectile_type = /obj/item/projectile/bullet/midbullet


 /obj/item/ammo_casing/shotgun
@@ -61,7 +61,7 @@
 	desc = "A 12 gauge shell."
 	icon_state = "gshell"
 	caliber = "shotgun"
-	projectile_type = "/obj/item/projectile/bullet"
+	projectile_type = /obj/item/projectile/bullet
 	m_amt = 12500


@@ -69,7 +69,7 @@
 	name = "shotgun shell"
 	desc = "A blank shell."
 	icon_state = "blshell"
-	projectile_type = ""
+	projectile_type = null
 	m_amt = 250


@@ -77,7 +77,7 @@
 	name = "beanbag shell"
 	desc = "A weak beanbag shell."
 	icon_state = "bshell"
-	projectile_type = "/obj/item/projectile/bullet/weakbullet"
+	projectile_type = /obj/item/projectile/bullet/weakbullet
 	m_amt = 500


@@ -85,7 +85,7 @@
 	name = "stun shell"
 	desc = "A stunning shell."
 	icon_state = "stunshell"
-	projectile_type = "/obj/item/projectile/bullet/stunshot"
+	projectile_type = /obj/item/projectile/bullet/stunshot
 	m_amt = 2500


@@ -93,18 +93,18 @@
 	name = "shotgun dart"
 	desc = "A dart for use in shotguns. Can be injected with up to 30 units of any chemical."
 	icon_state = "blshell" //someone, draw the icon, please.
-	projectile_type = "/obj/item/projectile/bullet/dart"
+	projectile_type = /obj/item/projectile/bullet/dart
 	m_amt = 12500
-	
-	New()
-		..()
-		flags |= NOREACT
-		create_reagents(30)

-	attackby()
-		return
+/obj/item/ammo_casing/shotgun/dart/New()
+	..()
+	flags |= NOREACT
+	create_reagents(30)
+
+/obj/item/ammo_casing/shotgun/dart/attackby()
+	return

 /obj/item/ammo_casing/a762
 	desc = "A 7.62 bullet casing."
 	caliber = "a762"
-	projectile_type = "/obj/item/projectile/bullet"
+	projectile_type = /obj/item/projectile/bullet
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -0,0 +1,149 @@
+////////////////INTERNAL MAGAZINES//////////////////////
+/obj/item/ammo_box/magazine/internal/cylinder
+	name = "revolver cylinder"
+	desc = "Oh god, this shouldn't be here"
+	ammo_type = /obj/item/ammo_casing/a357
+	caliber = "357"
+	max_ammo = 7
+
+/obj/item/ammo_box/magazine/internal/cylinder/ammo_count(var/countempties = 1)
+	if (!countempties)
+		var/boolets = 0
+		for (var/i = 1, i <= stored_ammo.len, i++)
+			var/obj/item/ammo_casing/bullet = stored_ammo[i]
+			if (bullet.BB)
+				boolets++
+		return boolets
+	else
+		return stored_ammo.len
+
+/obj/item/ammo_box/magazine/internal/cylinder/rus357
+	name = "russian revolver cylinder"
+	desc = "Oh god, this shouldn't be here"
+	ammo_type = /obj/item/ammo_casing/a357
+	caliber = "357"
+	max_ammo = 6
+
+/obj/item/ammo_box/magazine/internal/cylinder/rus357/New()
+	stored_ammo += new ammo_type(src)
+
+/obj/item/ammo_box/magazine/internal/cylinder/rev38
+	name = "d-tiv revolver cylinder"
+	desc = "Oh god, this shouldn't be here"
+	ammo_type = /obj/item/ammo_casing/c38
+	caliber = "38"
+	max_ammo = 6
+
+/obj/item/ammo_box/magazine/internal/shot
+	name = "shotgun internal magazine"
+	desc = "Oh god, this shouldn't be here"
+	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
+	caliber = "shotgun"
+	max_ammo = 4
+
+/obj/item/ammo_box/magazine/internal/shotcom
+	name = "combat shotgun internal magazine"
+	desc = "Oh god, this shouldn't be here"
+	ammo_type = /obj/item/ammo_casing/shotgun
+	caliber = "shotgun"
+	max_ammo = 8
+
+/obj/item/ammo_box/magazine/internal/cylinder/dualshot
+	name = "double-barrel shotgun internal magazine"
+	desc = "This doesn't even exist"
+	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
+	caliber = "shotgun"
+	max_ammo = 2
+
+///////////EXTERNAL MAGAZINES////////////////
+/obj/item/ammo_box/magazine/m9mm
+	name = "magazine (9mm)"
+	icon_state = "9x19p"
+	origin_tech = "combat=2"
+	ammo_type = /obj/item/ammo_casing/c9mm
+	caliber = "9mm"
+	max_ammo = 8
+	multiple_sprites = 2
+
+/obj/item/ammo_box/magazine/msmg9mm
+	name = "SMG magazine (9mm)"
+	icon_state = "smg9mm"
+	ammo_type = /obj/item/ammo_casing/c9mm
+	caliber = "9mm"
+	max_ammo = 18
+
+/obj/item/ammo_box/magazine/msmg9mm/update_icon()
+	..()
+	icon_state = "[initial(icon_state)]-[round(ammo_count(),3)]"
+
+/obj/item/ammo_box/magazine/m10mm
+	name = "magazine (10mm)"
+	icon_state = "9x19p"
+	origin_tech = "combat=2"
+	ammo_type = /obj/item/ammo_casing/c10mm
+	caliber = "10mm"
+	max_ammo = 8
+	multiple_sprites = 2
+
+/obj/item/ammo_box/magazine/m12mm
+	name = "magazine (12mm)"
+	icon_state = "12mm"
+	origin_tech = "combat=2"
+	ammo_type = /obj/item/ammo_casing/a12mm
+	caliber = "12mm"
+	max_ammo = 20
+
+/obj/item/ammo_box/magazine/m12mm/update_icon()
+	..()
+	icon_state = "[initial(icon_state)]-[round(ammo_count(),2)]"
+
+/obj/item/ammo_box/magazine/sm45
+	name = "magazine (.45)"
+	icon_state = "9x19p"
+	ammo_type = /obj/item/ammo_casing/c45
+	caliber = ".45"
+	max_ammo = 12
+
+/obj/item/ammo_box/magazine/sm45/update_icon()
+	..()
+	icon_state = "[initial(icon_state)]-[ammo_count() ? "8" : "0"]"
+
+/obj/item/ammo_box/magazine/uzim45
+	name = "Uzi magazine (.45)"
+	icon_state = "uzi45"
+	ammo_type = /obj/item/ammo_casing/c45
+	caliber = ".45"
+	max_ammo = 16
+
+/obj/item/ammo_box/magazine/uzim45/update_icon()
+	..()
+	icon_state = "[initial(icon_state)]-[round(ammo_count(),2)]"
+
+/obj/item/ammo_box/magazine/m50
+	name = "magazine (.50ae)"
+	icon_state = "50ae"
+	origin_tech = "combat=2"
+	ammo_type = /obj/item/ammo_casing/a50
+	caliber = ".50"
+	max_ammo = 7
+	multiple_sprites = 1
+
+/obj/item/ammo_box/magazine/m75
+	name = "magazine (.75)"
+	icon_state = "75"
+	ammo_type = /obj/item/ammo_casing/a75
+	caliber = "75"
+	multiple_sprites = 2
+	max_ammo = 8
+
+/obj/item/ammo_box/magazine/m762
+	name = "magazine (7.62mm)"
+	icon_state = "a762"
+	origin_tech = "combat=2"
+	ammo_type = /obj/item/ammo_casing/a762
+	caliber = "a762"
+	max_ammo = 50
+
+/obj/item/ammo_box/magazine/m762/update_icon()
+	..()
+	icon_state = "[initial(icon_state)]-[round(ammo_count(),10)]"
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -1,6 +1,6 @@
 /obj/item/weapon/gun
 	name = "gun"
-	desc = "Its a gun. It's pretty terrible, though."
+	desc = "It's a gun. It's pretty terrible, though."
 	icon = 'icons/obj/gun.dmi'
 	icon_state = "detective"
 	item_state = "gun"
@@ -17,13 +17,11 @@

 	var/fire_sound = "gunshot"
 	var/obj/item/projectile/in_chamber = null
-	var/caliber = ""
 	var/silenced = 0
 	var/recoil = 0
-	var/ejectshell = 1
 	var/clumsy_check = 1

-	proc/load_into_chamber()
+	proc/process_chambered()
 		return 0

 	proc/special_check(var/mob/M) //Placeholder for any special checks, like detective's revolver.
@@ -52,7 +50,7 @@
 			if(istype(user, /mob/living))
 				var/mob/living/M = user
 				if ((CLUMSY in M.mutations) && prob(40))
-					M << "<span class='danger'>You shoot yourself in the foot with the [src]!</span>"
+					M << "<span class='danger'>You shoot yourself in the foot with \the [src]!</span>"
 					afterattack(user, user)
 					M.drop_item()
 					return
@@ -80,9 +78,8 @@

 		if(!special_check(user))
 			return
-		if(!load_into_chamber())
+		if(!process_chambered())
 			shoot_with_empty_chamber(user)
-			return

 		if(!in_chamber)
 			return
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -26,7 +26,7 @@
 		return


-	load_into_chamber()
+	process_chambered()
 		if(in_chamber)	return 1
 		if(!power_supply)	return 0
 		if(!power_supply.use(charge_cost))	return 0
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -50,7 +50,7 @@ obj/item/weapon/gun/energy/laser/retro



-/obj/item/weapon/gun/energy/laser/cyborg/load_into_chamber()
+/obj/item/weapon/gun/energy/laser/cyborg/process_chambered()
 	if(in_chamber)
 		return 1
 	if(isrobot(src.loc))
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -1,92 +1,88 @@
 /obj/item/weapon/gun/projectile
-	desc = "A classic revolver. Uses 357 ammo"
-	name = "revolver"
-	icon_state = "revolver"
-	caliber = "357"
+	desc = "Now comes in flavors like GUN. Uses 10mm ammo, for some reason"
+	name = "projectile gun"
+	icon_state = "pistol"
 	origin_tech = "combat=2;materials=2"
 	w_class = 3.0
 	m_amt = 1000

-	var/ammo_type = "/obj/item/ammo_casing/a357"
-	var/list/loaded = list()
-	var/max_shells = 7
-	var/load_method = 0 //0 = Single shells or quick loader, 1 = box, 2 = magazine
-	var/obj/item/ammo_magazine/empty_mag = null
+	var/ammo_type = /obj/item/ammo_casing/c10mm
+	var/mag_type = /obj/item/ammo_box/magazine/m10mm //Removes the need for max_ammo and caliber info
+	var/obj/item/ammo_box/magazine/magazine
+	var/obj/item/ammo_casing/chambered = null // The round (not bullet) that is in the chamber.


 /obj/item/weapon/gun/projectile/New()
 	..()
-	for(var/i = 1, i <= max_shells, i++)
-		loaded += new ammo_type(src)
+	magazine = new mag_type(src)
+	chamber_round()
 	update_icon()
 	return

-
-/obj/item/weapon/gun/projectile/load_into_chamber()
+/obj/item/weapon/gun/projectile/process_chambered()
 //	if(in_chamber)
-//		return 1 {R}
+//		return 1

-	if(!loaded.len)
-		return 0
-	var/obj/item/ammo_casing/AC = loaded[1] //load next casing.
-	loaded -= AC //Remove casing from loaded list.
+	var/obj/item/ammo_casing/AC = chambered //Find chambered round
 	if(isnull(AC) || !istype(AC))
 		return 0
 	AC.loc = get_turf(src) //Eject casing onto ground.
-	AC.desc += " This one is spent."	//descriptions are magic
+	chambered = null
+	chamber_round()
 	if(AC.BB)
 		in_chamber = AC.BB //Load projectile into chamber.
 		AC.BB.loc = src //Set projectile loc to gun.
 		AC.BB = null
+		AC.update_icon()
 		return 1
 	return 0

+/obj/item/weapon/gun/projectile/proc/chamber_round()
+	if (chambered || !magazine)
+		return
+	else if (magazine.ammo_count())
+		chambered = magazine.get_round()
+		chambered.loc = src
+	return

 /obj/item/weapon/gun/projectile/attackby(var/obj/item/A as obj, mob/user as mob)
-
-	var/num_loaded = 0
-	if(istype(A, /obj/item/ammo_magazine))
-		if((load_method == 2) && loaded.len)	return
-		var/obj/item/ammo_magazine/AM = A
-		for(var/obj/item/ammo_casing/AC in AM.stored_ammo)
-			if(loaded.len >= max_shells)
-				break
-			if(AC.caliber == caliber && loaded.len < max_shells)
-				AC.loc = src
-				AM.stored_ammo -= AC
-				loaded += AC
-				num_loaded++
-		if(load_method == 2)
+	if (istype(A, /obj/item/ammo_box/magazine))
+		var/obj/item/ammo_box/magazine/AM = A
+		if (!magazine && istype(AM, mag_type))
 			user.remove_from_mob(AM)
-			empty_mag = AM
-			empty_mag.loc = src
-	if(istype(A, /obj/item/ammo_casing) && !load_method)
-		var/obj/item/ammo_casing/AC = A
-		if(AC.caliber == caliber && loaded.len < max_shells)
-			user.drop_item()
-			AC.loc = src
-			loaded += AC
-			num_loaded++
-	if(num_loaded)
-		user << "<span class='notice'>You load [num_loaded] shell\s into the gun!</span>"
-	A.update_icon()
+			magazine = AM
+			magazine.loc = src
+			user << "<span class='notice'>You load a new magazine into \the [src]!</span>"
+			chamber_round()
+			A.update_icon()
+			update_icon()
+			return 1
+		else if (magazine)
+			user << "<span class='notice'>There's already a magazine in \the [src].</span>"
+	return 0
+
+/obj/item/weapon/gun/projectile/attack_self(mob/living/user as mob)
+	if (magazine)
+		magazine.loc = get_turf(src.loc)
+		user.put_in_hands(magazine)
+		magazine.update_icon()
+		magazine = null
+		user << "<span class='notice'>You pull the magazine out of \the [src]!</span>"
+	else
+		user << "<span class='notice'>There's no magazine in \the [src].</span>"
 	update_icon()
 	return


 /obj/item/weapon/gun/projectile/examine()
 	..()
-	usr << "Has [getAmmo()] round\s remaining."
-//		if(in_chamber && !loaded.len)
-//			usr << "However, it has a chambered round."
-//		if(in_chamber && loaded.len)
-//			usr << "It also has a chambered round." {R}
+	usr << "Has [get_ammo()] round\s remaining."
 	return

-/obj/item/weapon/gun/projectile/proc/getAmmo()
-	var/bullets = 0
-	for(var/obj/item/ammo_casing/AC in loaded)
-		if(istype(AC))
-			bullets += 1
-	return bullets
-
+/obj/item/weapon/gun/projectile/proc/get_ammo(var/countchambered = 1)
+	var/boolets = 0 //mature var names for mature people
+	if (chambered && countchambered)
+		boolets++
+	if (magazine)
+		boolets += magazine.ammo_count()
+	return boolets
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -3,11 +3,19 @@
 	desc = "A lightweight, fast firing gun. Uses 9mm rounds."
 	icon_state = "saber"	//ugly
 	w_class = 3.0
-	max_shells = 18
-	caliber = "9mm"
 	origin_tech = "combat=4;materials=2"
-	ammo_type = "/obj/item/ammo_casing/c9mm"
+	ammo_type = /obj/item/ammo_casing/c9mm
+	mag_type = /obj/item/ammo_box/magazine/msmg9mm
+	var/alarmed = 0

+/obj/item/weapon/gun/projectile/automatic/update_icon()
+	..()
+	icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"]"
+	return
+
+/obj/item/weapon/gun/projectile/automatic/attackby(var/obj/item/A as obj, mob/user as mob)
+	if(..() && chambered)
+		alarmed = 0


 /obj/item/weapon/gun/projectile/automatic/mini_uzi
@@ -15,10 +23,9 @@
 	desc = "A lightweight, fast firing gun, for when you want someone dead. Uses .45 rounds."
 	icon_state = "mini-uzi"
 	w_class = 3.0
-	max_shells = 16
-	caliber = ".45"
 	origin_tech = "combat=5;materials=2;syndicate=8"
-	ammo_type = "/obj/item/ammo_casing/c45"
+	ammo_type = /obj/item/ammo_casing/c45
+	mag_type = /obj/item/ammo_box/magazine/uzim45



@@ -28,38 +35,31 @@
 	icon_state = "c20r"
 	item_state = "c20r"
 	w_class = 3.0
-	max_shells = 20
-	caliber = "12mm"
 	origin_tech = "combat=5;materials=2;syndicate=8"
-	ammo_type = "/obj/item/ammo_casing/a12mm"
+	ammo_type = /obj/item/ammo_casing/a12mm
+	mag_type = /obj/item/ammo_box/magazine/m12mm
 	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
-	load_method = 2
-
-
-	New()
-		..()
-		empty_mag = new /obj/item/ammo_magazine/a12mm/empty(src)
-		update_icon()
-		return
-
-
-	afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
-		..()
-		if(!loaded.len && empty_mag)
-			empty_mag.loc = get_turf(src.loc)
-			empty_mag = null
-			playsound(user, 'sound/weapons/smg_empty_alarm.ogg', 40, 1)
-			update_icon()
-		return


+/obj/item/weapon/gun/projectile/automatic/c20r/New()
+	..()
 	update_icon()
-		..()
-		if(empty_mag)
-			icon_state = "c20r-[round(loaded.len,4)]"
-		else
-			icon_state = "c20r"
-		return
+	return
+
+
+/obj/item/weapon/gun/projectile/automatic/c20r/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
+	..()
+	if(!chambered && !get_ammo() && !alarmed)
+		playsound(user, 'sound/weapons/smg_empty_alarm.ogg', 40, 1)
+		update_icon()
+		alarmed = 1
+	return
+
+
+/obj/item/weapon/gun/projectile/automatic/c20r/update_icon()
+	..()
+	icon_state = "c20r[magazine ? "-[round(get_ammo(0),4)]" : ""][chambered ? "" : "-e"]"
+	return



@@ -70,14 +70,11 @@
 	item_state = "l6closedmag"
 	w_class = 5
 	slot_flags = 0
-	max_shells = 50
-	caliber = "a762"
 	origin_tech = "combat=5;materials=1;syndicate=2"
-	ammo_type = "/obj/item/ammo_casing/a762"
+	ammo_type = /obj/item/ammo_casing/a762
+	mag_type = /obj/item/ammo_box/magazine/m762
 	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
-	load_method = 2
 	var/cover_open = 0
-	var/mag_inserted = 1


 /obj/item/weapon/gun/projectile/automatic/l6_saw/attack_self(mob/user as mob)
@@ -87,7 +84,7 @@


 /obj/item/weapon/gun/projectile/automatic/l6_saw/update_icon()
-	icon_state = "l6[cover_open ? "open" : "closed"][mag_inserted ? round(loaded.len, 25) : "-empty"]"
+	icon_state = "l6[cover_open ? "open" : "closed"][magazine ? round(magazine.ammo_count() * 2, 25) : "-empty"]"


 /obj/item/weapon/gun/projectile/automatic/l6_saw/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params) //what I tried to do here is just add a check to see if the cover is open or not and add an icon_state change because I can't figure out how c-20rs do it with overlays
@@ -102,19 +99,14 @@
 	if(loc != user)
 		..()
 		return	//let them pick it up
-	if(!cover_open || (cover_open && !mag_inserted))
+	if(!cover_open || (cover_open && !magazine))
 		..()
-	else if(cover_open && mag_inserted)
+	else if(cover_open && magazine)
 		//drop the mag
-		empty_mag = new /obj/item/ammo_magazine/a762(src)
-		empty_mag.stored_ammo = loaded
-		empty_mag.icon_state = "a762-[round(loaded.len, 10)]"
-		empty_mag.desc = "There are [loaded.len] shells left!"
-		empty_mag.loc = get_turf(src.loc)
-		user.put_in_hands(empty_mag)
-		empty_mag = null
-		mag_inserted = 0
-		loaded = list()
+		magazine.update_icon()
+		magazine.loc = get_turf(src.loc)
+		user.put_in_hands(magazine)
+		magazine = null
 		update_icon()
 		user << "<span class='notice'>You remove the magazine from [src].</span>"

@@ -123,13 +115,6 @@
 	if(!cover_open)
 		user << "<span class='notice'>[src]'s cover is closed! You can't insert a new mag!</span>"
 		return
-	else if(cover_open && mag_inserted)
-		user << "<span class='notice'>[src] already has a magazine inserted!</span>"
-		return
-	else if(cover_open && !mag_inserted)
-		mag_inserted = 1
-		user << "<span class='notice'>You insert the magazine!</span>"
-		update_icon()
 	..()


@@ -138,4 +123,6 @@
   However, it looks like subsequent guns that use removable magazines don't take that into account and just get
   around simulating a removable magazine by adding the casings into the loaded list and spawning an empty magazine
   when the gun is out of rounds. Which means you can't eject magazines with rounds in them. The below is a very
-   rough and poor attempt at making that happen. -Ausops */
+   rough and poor attempt at making that happen. -Ausops */
+
+/* Where Ausops failed, I have not. -SirBayer */
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -1,114 +1,103 @@
-/obj/item/weapon/gun/projectile/silenced
+/obj/item/weapon/gun/projectile/automatic/silenced
 	name = "silenced pistol"
 	desc = "A small, quiet,  easily concealable gun. Uses .45 rounds."
 	icon_state = "silenced_pistol"
 	w_class = 3.0
-	max_shells = 12
-	caliber = ".45"
 	silenced = 1
 	origin_tech = "combat=2;materials=2;syndicate=8"
-	ammo_type = "/obj/item/ammo_casing/c45"
+	ammo_type = /obj/item/ammo_casing/c45
+	mag_type = /obj/item/ammo_box/magazine/sm45
 	fire_sound = 'sound/weapons/Gunshot_silenced.ogg'

+/obj/item/weapon/gun/projectile/automatic/silenced/update_icon()
+	..()
+	icon_state = "[initial(icon_state)]"
+	return

-/obj/item/weapon/gun/projectile/deagle
+
+/obj/item/weapon/gun/projectile/automatic/deagle
 	name = "desert eagle"
 	desc = "A robust handgun that uses .50 AE ammo"
 	icon_state = "deagle"
 	force = 14.0
-	max_shells = 7
-	caliber = ".50"
-	ammo_type ="/obj/item/ammo_casing/a50"
-	load_method = 2
-	New()
-		..()
-		empty_mag = new /obj/item/ammo_magazine/a50/empty(src)
+	ammo_type = /obj/item/ammo_casing/a50
+	mag_type = /obj/item/ammo_box/magazine/m50
+
+
+/obj/item/weapon/gun/projectile/automatic/deagle/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
+	..()
+	if(!chambered && !get_ammo() && !alarmed)
+		playsound(user, 'sound/weapons/smg_empty_alarm.ogg', 40, 1)
 		update_icon()
-		return
+		alarmed = 1
+	return

+/obj/item/weapon/gun/projectile/automatic/deagle/update_icon()
+	..()
+	icon_state = "[initial(icon_state)][magazine ? "" : "-e"]"

-	afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
-		..()
-		if(!loaded.len && empty_mag)
-			empty_mag.loc = get_turf(src.loc)
-			empty_mag = null
-			playsound(user, 'sound/weapons/smg_empty_alarm.ogg', 40, 1)
-			update_icon()
-		return
-
-/obj/item/weapon/gun/projectile/deagle/gold
+/obj/item/weapon/gun/projectile/automatic/deagle/gold
 	desc = "A gold plated gun folded over a million times by superior martian gunsmiths. Uses .50 AE ammo."
 	icon_state = "deagleg"
 	item_state = "deagleg"



-/obj/item/weapon/gun/projectile/deagle/camo
+/obj/item/weapon/gun/projectile/automatic/deagle/camo
 	desc = "A Deagle brand Deagle for operators operating operationally. Uses .50 AE ammo."
 	icon_state = "deaglecamo"
 	item_state = "deagleg"



-/obj/item/weapon/gun/projectile/gyropistol
+/obj/item/weapon/gun/projectile/automatic/gyropistol
 	name = "gyrojet pistol"
 	desc = "A bulky pistol designed to fire self propelled rounds"
 	icon_state = "gyropistol"
-	max_shells = 8
-	caliber = "75"
 	fire_sound = 'sound/effects/Explosion1.ogg'
 	origin_tech = "combat=3"
-	ammo_type = "/obj/item/ammo_casing/a75"
-	load_method = 2
-	New()
-		..()
-		empty_mag = new /obj/item/ammo_magazine/a75/empty(src)
-		update_icon()
-		return
-
-
-	afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
-		..()
-		if(!loaded.len && empty_mag)
-			empty_mag.loc = get_turf(src.loc)
-			empty_mag = null
-			playsound(user, 'sound/weapons/smg_empty_alarm.ogg', 40, 1)
-			update_icon()
-		return
+	ammo_type = /obj/item/ammo_casing/a75
+	mag_type = /obj/item/ammo_box/magazine/m75

+/obj/item/weapon/gun/projectile/automatic/gyropistol/New()
+	..()
 	update_icon()
-		..()
-		if(empty_mag)
-			icon_state = "gyropistolloaded"
-		else
-			icon_state = "gyropistol"
-		return
+	return

-/obj/item/weapon/gun/projectile/pistol
+
+/obj/item/weapon/gun/projectile/automatic/gyropistol/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
+	..()
+	if(!chambered && !get_ammo() && !alarmed)
+		playsound(user, 'sound/weapons/smg_empty_alarm.ogg', 40, 1)
+		update_icon()
+		alarmed = 1
+	return
+
+/obj/item/weapon/gun/projectile/automatic/gyropistol/update_icon()
+	..()
+	icon_state = "[initial(icon_state)][magazine ? "loaded" : ""]"
+	return
+
+/obj/item/weapon/gun/projectile/automatic/pistol
 	name = "\improper Stechtkin pistol"
 	desc = "A small, easily concealable gun. Uses 10mm rounds."
 	icon_state = "pistol"
 	w_class = 2
-	max_shells = 8
-	caliber = "10mm"
 	silenced = 0
 	origin_tech = "combat=2;materials=2;syndicate=2"
-	ammo_type = "/obj/item/ammo_casing/c10mm"
-	load_method = 2
+	ammo_type = /obj/item/ammo_casing/c10mm
+	mag_type = /obj/item/ammo_box/magazine/m10mm

-/obj/item/weapon/gun/projectile/pistol/New()
+/obj/item/weapon/gun/projectile/automatic/pistol/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
 	..()
-	empty_mag = new /obj/item/ammo_magazine/mc10mm/empty(src)
+	if(magazine)
+		if(!chambered && !magazine.ammo_count())
+			magazine.update_icon()
+			magazine.loc = get_turf(src.loc)
+			magazine = null
 	return

-/obj/item/weapon/gun/projectile/pistol/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
-	..()
-	if(!loaded.len && empty_mag)
-		empty_mag.loc = get_turf(src.loc)
-		empty_mag = null
-	return
-
-/obj/item/weapon/gun/projectile/pistol/attack_hand(mob/user as mob)
+/obj/item/weapon/gun/projectile/automatic/pistol/attack_hand(mob/user as mob)
 	if(loc == user)
 		if(silenced)
 			if(user.l_hand != src && user.r_hand != src)
@@ -125,7 +114,7 @@
 	..()


-/obj/item/weapon/gun/projectile/pistol/attackby(obj/item/I as obj, mob/user as mob)
+/obj/item/weapon/gun/projectile/automatic/pistol/attackby(obj/item/I as obj, mob/user as mob)
 	if(istype(I, /obj/item/weapon/silencer))
 		if(user.l_hand != src && user.r_hand != src)	//if we're not in his hands
 			user << "<span class='notice'>You'll need [src] in your hands to do that.</span>"
@@ -142,12 +131,10 @@
 		return
 	..()

-/obj/item/weapon/gun/projectile/pistol/update_icon()
+/obj/item/weapon/gun/projectile/automatic/pistol/update_icon()
 	..()
-	if(silenced)
-		icon_state = "pistol-silencer"
-	else
-		icon_state = "pistol"
+	icon_state = "[initial(icon_state)][silenced ? "-silencer" : ""][chambered ? "" : "-e"]"
+	return

 /obj/item/weapon/silencer
 	name = "silencer"
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -1,92 +1,165 @@
-/obj/item/weapon/gun/projectile/detective
+/obj/item/weapon/gun/projectile/revolver
+	desc = "A classic revolver. Uses 357 ammo"
+	name = "revolver"
+	icon_state = "revolver"
+	ammo_type = /obj/item/ammo_casing/a357
+	mag_type = /obj/item/ammo_box/magazine/internal/cylinder
+
+/obj/item/weapon/gun/projectile/revolver/chamber_round()
+	if (chambered || !magazine)
+		return
+	else if (magazine.ammo_count())
+		chambered = magazine.get_round(1)
+	return
+
+/obj/item/weapon/gun/projectile/revolver/process_chambered()
+	var/obj/item/ammo_casing/AC = chambered //Find chambered round
+	if(isnull(AC) || !istype(AC))
+		return 0
+	chambered = null
+	chamber_round()
+	if(AC.BB)
+		in_chamber = AC.BB //Load projectile into chamber.
+		AC.BB.loc = src //Set projectile loc to gun.
+		AC.BB = null
+		AC.update_icon()
+		return 1
+	return 0
+
+/obj/item/weapon/gun/projectile/revolver/attackby(var/obj/item/A as obj, mob/user as mob)
+	var/num_loaded = 0
+	if(istype(A, /obj/item/ammo_box))
+		var/obj/item/ammo_box/AM = A
+		for(var/obj/item/ammo_casing/AC in AM.stored_ammo)
+			if(magazine.give_round(AC))
+				AM.stored_ammo -= AC
+				num_loaded++
+			else
+				break
+	if(istype(A, /obj/item/ammo_casing))
+		var/obj/item/ammo_casing/AC = A
+		if(magazine.give_round(AC))
+			user.drop_item()
+			AC.loc = src
+			num_loaded++
+	if(num_loaded)
+		user << "<span class='notice'>You load [num_loaded] shell\s into \the [src]!</span>"
+		A.update_icon()
+		update_icon()
+		chamber_round()
+
+/obj/item/weapon/gun/projectile/revolver/attack_self(mob/living/user as mob)
+	var/num_unloaded = 0
+	while (get_ammo() > 0)
+		var/obj/item/ammo_casing/CB
+		CB = magazine.get_round(0)
+		chambered = null
+		CB.loc = get_turf(src.loc)
+		CB.update_icon()
+		num_unloaded++
+	if (num_unloaded)
+		user << "<span class = 'notice'>You unload [num_unloaded] shell\s from [src]!</span>"
+	else
+		user << "<span class='notice'>[src] is empty.</span>"
+
+/obj/item/weapon/gun/projectile/revolver/get_ammo(var/countchambered = 0, var/countempties = 1)
+	var/boolets = 0 //mature var names for mature people
+	if (chambered && countchambered)
+		boolets++
+	if (magazine)
+		boolets += magazine.ammo_count(countempties)
+	return boolets
+
+/obj/item/weapon/gun/projectile/revolver/examine()
+	..()
+	usr << "[get_ammo(0,0)] of those are live rounds."
+
+/obj/item/weapon/gun/projectile/revolver/detective
 	desc = "A cheap Martian knock-off of a Smith & Wesson Model 10. Uses .38-Special rounds."
 	name = "revolver"
 	icon_state = "detective"
-	max_shells = 6
-	caliber = "38"
 	origin_tech = "combat=2;materials=2"
-	ammo_type = "/obj/item/ammo_casing/c38"
+	ammo_type = /obj/item/ammo_casing/c38
+	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38


-	special_check(var/mob/living/carbon/human/M)
-		if(caliber == initial(caliber))
-			return 1
-		if(prob(70 - (loaded.len * 10)))	//minimum probability of 10, maximum of 60
-			M << "<span class='danger'>[src] blows up in your face.</span>"
-			M.take_organ_damage(0,20)
-			M.drop_item()
-			del(src)
-			return 0
+/obj/item/weapon/gun/projectile/revolver/detective/special_check(var/mob/living/carbon/human/M)
+	if(magazine.caliber == initial(magazine.caliber))
+		return 1
+	if(prob(70 - (magazine.ammo_count() * 10)))	//minimum probability of 10, maximum of 60
+		M << "<span class='danger'>[src] blows up in your face.</span>"
+		M.take_organ_damage(0,20)
+		M.drop_item()
+		del(src)
+		return 0
+	return 1
+
+/obj/item/weapon/gun/projectile/revolver/detective/verb/rename_gun()
+	set name = "Name Gun"
+	set category = "Object"
+	set desc = "Click to rename your gun."
+
+	var/mob/M = usr
+	var/input = stripped_input(M,"What do you want to name the gun?", ,"", MAX_NAME_LEN)
+
+	if(src && input && !M.stat && in_range(M,src))
+		name = input
+		M << "You name the gun [input]. Say hello to your new friend."
 		return 1

-	verb/rename_gun()
-		set name = "Name Gun"
-		set category = "Object"
-		set desc = "Click to rename your gun. If you're the detective."
+/obj/item/weapon/gun/projectile/revolver/detective/verb/reskin_gun()
+	set name = "Reskin gun"
+	set category = "Object"
+	set desc = "Click to reskin your gun."

-		var/mob/M = usr
-		var/input = stripped_input(M,"What do you want to name the gun?", ,"", MAX_NAME_LEN)
+	var/mob/M = usr
+	var/list/options = list()
+	options["The Original"] = "detective"
+	options["Leopard Spots"] = "detective_leopard"
+	options["Black Panther"] = "detective_panther"
+	options["Gold Trim"] = "detective_gold"
+	options["The Peacemaker"] = "detective_peacemaker"
+	var/choice = input(M,"What do you want to skin the gun to?","Reskin Gun") in options

-		if(src && input && !M.stat && in_range(M,src))
-			name = input
-			M << "You name the gun [input]. Say hello to your new friend."
-			return 1
+	if(src && choice && !M.stat && in_range(M,src))
+		icon_state = options[choice]
+		M << "Your gun is now skinned as [choice]. Say hello to your new friend."
+		return 1

-	verb/reskin_gun()
-		set name = "Reskin gun"
-		set category = "Object"
-		set desc = "Click to reskin your gun. If you're the detective."
-
-		var/mob/M = usr
-		var/list/options = list()
-		options["The Original"] = "detective"
-		options["Leopard Spots"] = "detective_leopard"
-		options["Black Panther"] = "detective_panther"
-		options["Gold Trim"] = "detective_gold"
-		options["The Peacemaker"] = "detective_peacemaker"
-		var/choice = input(M,"What do you want to skin the gun to?","Reskin Gun") in options
-
-		if(src && choice && !M.stat && in_range(M,src))
-			icon_state = options[choice]
-			M << "Your gun is now skinned as [choice]. Say hello to your new friend."
-			return 1
-
-	attackby(var/obj/item/A as obj, mob/user as mob)
-		..()
-		if(istype(A, /obj/item/weapon/screwdriver))
-			if(caliber == "38")
-				user << "<span class='notice'>You begin to reinforce the barrel of [src].</span>"
-				if(loaded.len)
-					afterattack(user, user)	//you know the drill
-					playsound(user, fire_sound, 50, 1)
-					user.visible_message("<span class='danger'>[src] goes off!</span>", "<span class='danger'>[src] goes off in your face!</span>")
+/obj/item/weapon/gun/projectile/revolver/detective/attackby(var/obj/item/A as obj, mob/user as mob)
+	..()
+	if(istype(A, /obj/item/weapon/screwdriver))
+		if(magazine.caliber == "38")
+			user << "<span class='notice'>You begin to reinforce the barrel of [src].</span>"
+			if(magazine.ammo_count())
+				afterattack(user, user)	//you know the drill
+				user.visible_message("<span class='danger'>[src] goes off!</span>", "<span class='danger'>[src] goes off in your face!</span>")
+				return
+			if(do_after(user, 30))
+				if(magazine.ammo_count())
+					user << "<span class='notice'>You can't modify it!</span>"
 					return
-				if(do_after(user, 30))
-					if(loaded.len)
-						user << "<span class='notice'>You can't modify it!</span>"
-						return
-					caliber = "357"
-					desc = "The barrel and chamber assembly seems to have been modified."
-					user << "<span class='warning'>You reinforce the barrel of [src]! Now it will fire .357 rounds.</span>"
-			else
-				user << "<span class='notice'>You begin to revert the modifications to [src].</span>"
-				if(loaded.len)
-					afterattack(user, user)	//and again
-					playsound(user, fire_sound, 50, 1)
-					user.visible_message("<span class='danger'>[src] goes off!</span>", "<span class='danger'>[src] goes off in your face!</span>")
+				magazine.caliber = "357"
+				desc = "The barrel and chamber assembly seems to have been modified."
+				user << "<span class='warning'>You reinforce the barrel of [src]! Now it will fire .357 rounds.</span>"
+		else
+			user << "<span class='notice'>You begin to revert the modifications to [src].</span>"
+			if(magazine.ammo_count())
+				afterattack(user, user)	//and again
+				user.visible_message("<span class='danger'>[src] goes off!</span>", "<span class='danger'>[src] goes off in your face!</span>")
+				return
+			if(do_after(user, 30))
+				if(magazine.ammo_count())
+					user << "<span class='notice'>You can't modify it!</span>"
 					return
-				if(do_after(user, 30))
-					if(loaded.len)
-						user << "<span class='notice'>You can't modify it!</span>"
-						return
-					caliber = "38"
-					desc = initial(desc)
-					user << "<span class='warning'>You remove the modifications on [src]! Now it will fire .38 rounds.</span>"
+				magazine.caliber = "38"
+				desc = initial(desc)
+				user << "<span class='warning'>You remove the modifications on [src]! Now it will fire .38 rounds.</span>"




-/obj/item/weapon/gun/projectile/mateba
+/obj/item/weapon/gun/projectile/revolver/mateba
 	name = "mateba"
 	desc = "When you absolutely, positively need a 10mm hole in the other guy. Uses .357 ammo."	//>10mm hole >.357
 	icon_state = "mateba"
@@ -95,67 +168,77 @@
 // A gun to play Russian Roulette!
 // You can spin the chamber to randomize the position of the bullet.

-/obj/item/weapon/gun/projectile/russian
+/obj/item/weapon/gun/projectile/revolver/russian
 	name = "Russian Revolver"
-	desc = "A Russian made revolver. Uses .357 ammo. It has a single slot in it's chamber for a bullet."
-	max_shells = 6
+	desc = "A Russian made revolver. Uses .357 ammo. It has a single slot in its chamber for a bullet."
 	origin_tech = "combat=2;materials=2"
+	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rus357
+	var/spun = 0

-/obj/item/weapon/gun/projectile/russian/New()
+/obj/item/weapon/gun/projectile/revolver/russian/New()
+	..()
 	Spin()
 	update_icon()

-/obj/item/weapon/gun/projectile/russian/proc/Spin()
-
-	for(var/obj/item/ammo_casing/AC in loaded)
-		del(AC)
-	loaded = list()
-	var/random = rand(1, max_shells)
-	for(var/i = 1; i <= max_shells; i++)
-		if(i != random)
-			loaded += i // Basically null
-		else
-			loaded += new ammo_type(src)
-
-
-/obj/item/weapon/gun/projectile/russian/attackby(var/obj/item/A as obj, mob/user as mob)
-
-	if(!A) return
+/obj/item/weapon/gun/projectile/revolver/russian/proc/Spin()
+	chambered = null
+	var/random = rand(1, magazine.max_ammo)
+	if(random <= get_ammo(0,0))
+		chamber_round()
+	spun = 1

+/obj/item/weapon/gun/projectile/revolver/russian/attackby(var/obj/item/A as obj, mob/user as mob)
 	var/num_loaded = 0
-	if(istype(A, /obj/item/ammo_magazine))
-
-		if((load_method == 2) && loaded.len)	return
-		var/obj/item/ammo_magazine/AM = A
+	if(istype(A, /obj/item/ammo_box))
+		var/obj/item/ammo_box/AM = A
 		for(var/obj/item/ammo_casing/AC in AM.stored_ammo)
-			if(getAmmo() > 0 || loaded.len >= max_shells)
-				break
-			if(AC.caliber == caliber && loaded.len < max_shells)
-				AC.loc = src
-				AM.stored_ammo -= AC
-				loaded += AC
-				num_loaded++
+			if(get_ammo() <= 1)
+				if(magazine.give_round(AC))
+					AM.stored_ammo -= AC
+					num_loaded++
 			break
-		A.update_icon()
-
+	if(istype(A, /obj/item/ammo_casing))
+		var/obj/item/ammo_casing/AC = A
+		if(get_ammo() <= 1)
+			magazine.give_round(AC)
+			user.drop_item()
+			AC.loc = src
+			num_loaded++
 	if(num_loaded)
 		user.visible_message("<span class='warning'>[user] loads a single bullet into the revolver and spins the chamber.</span>", "<span class='warning'>You load a single bullet into the chamber and spin it.</span>")
 	else
 		user.visible_message("<span class='warning'>[user] spins the chamber of the revolver.</span>", "<span class='warning'>You spin the revolver's chamber.</span>")
-	if(getAmmo() > 0)
+	if(get_ammo() > 0)
 		Spin()
 	update_icon()
+	A.update_icon()
 	return

-/obj/item/weapon/gun/projectile/russian/attack_self(mob/user as mob)
-
-	user.visible_message("<span class='warning'>[user] spins the chamber of the revolver.</span>", "<span class='warning'>You spin the revolver's chamber.</span>")
-	if(getAmmo() > 0)
+/obj/item/weapon/gun/projectile/revolver/russian/attack_self(mob/user as mob)
+	if(!spun && get_ammo(0,0))
+		user.visible_message("<span class='warning'>[user] spins the chamber of the revolver.</span>", "<span class='warning'>You spin the revolver's chamber.</span>")
 		Spin()
+	else
+		var/num_unloaded = 0
+		while (get_ammo() > 0)
+			var/obj/item/ammo_casing/CB
+			CB = magazine.get_round()
+			chambered = null
+			CB.loc = get_turf(src.loc)
+			CB.update_icon()
+			num_unloaded++
+		if (num_unloaded)
+			user << "<span class = 'notice'>You unload [num_unloaded] shell\s from [src]!</span>"
+		else
+			user << "<span class='notice'>[src] is empty.</span>"

-/obj/item/weapon/gun/projectile/russian/attack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj)
+/obj/item/weapon/gun/projectile/revolver/russian/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params)
+	..()
+	spun = 0

-	if(!loaded.len)
+/obj/item/weapon/gun/projectile/revolver/russian/attack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj)
+
+	if(!chambered)
 		user.visible_message("\red *click*", "\red *click*")
 		return

@@ -163,9 +246,8 @@
 		if(target == user)
 			var/obj/item/organ/limb/affecting = user.zone_sel.selecting
 			if(affecting == "head")
-
-				var/obj/item/ammo_casing/AC = loaded[1]
-				if(!load_into_chamber())
+				var/obj/item/ammo_casing/AC = chambered
+				if(!process_chambered())
 					user.visible_message("\red *click*", "\red *click*")
 					return
 				if(!in_chamber)
@@ -176,5 +258,7 @@
 				if(!P.nodamage)
 					user.apply_damage(300, BRUTE, affecting) // You are dead, dead, dead.
 				return
+
+	spun = 0
 	..()

--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -1,148 +1,145 @@
+/obj/item/weapon/gun/projectile/shotgun
+	name = "shotgun"
+	desc = "This almost certainly shouldn't be here."
+	icon_state = "shotgun"
+	item_state = "shotgun"
+	ammo_type = /obj/item/ammo_casing/shotgun
+	mag_type = /obj/item/ammo_box/magazine/internal/shot
+
+/obj/item/weapon/gun/projectile/shotgun/attackby(var/obj/item/A as obj, mob/user as mob)
+	var/num_loaded = 0
+	if(istype(A, /obj/item/ammo_box))
+		var/obj/item/ammo_box/AM = A
+		for(var/obj/item/ammo_casing/AC in AM.stored_ammo)
+			if(magazine.give_round(AC))
+				AM.stored_ammo -= AC
+				num_loaded++
+			else
+				break
+	if(istype(A, /obj/item/ammo_casing))
+		var/obj/item/ammo_casing/AC = A
+		if(magazine.give_round(AC))
+			user.drop_item()
+			AC.loc = src
+			num_loaded++
+	if(num_loaded)
+		user << "<span class='notice'>You load [num_loaded] shell\s into \the [src]!</span>"
+		A.update_icon()
+		update_icon()
+
 /obj/item/weapon/gun/projectile/shotgun/pump
 	name = "shotgun"
 	desc = "Useful for sweeping alleys."
 	icon_state = "shotgun"
 	item_state = "shotgun"
-	max_shells = 4
 	w_class = 4.0
 	force = 10
 	flags =  FPRINT | TABLEPASS | CONDUCT
 	slot_flags = SLOT_BACK
-	caliber = "shotgun"
 	origin_tech = "combat=4;materials=2"
-	ammo_type = "/obj/item/ammo_casing/shotgun/beanbag"
+	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
 	var/recentpump = 0 // to prevent spammage
 	var/pumped = 0
-	var/obj/item/ammo_casing/current_shell = null


-	load_into_chamber()
-		if(in_chamber)
-			var/obj/item/ammo_casing/AC = current_shell
-			if(AC.reagents && AC.BB.reagents)
-				var/datum/reagents/casting_reagents = AC.reagents
-				casting_reagents.trans_to(AC.BB, casting_reagents.total_volume) //For chemical darts
-				casting_reagents.delete()
-			AC.desc += " This one is spent."
-			AC.BB = null //remove the ammunition from the shell
-			return 1
+/obj/item/weapon/gun/projectile/shotgun/pump/process_chambered()
+	var/obj/item/ammo_casing/AC = chambered //Find chambered round
+	if(isnull(AC) || !istype(AC))
 		return 0
-
-
-	attack_self(mob/living/user as mob)
-		if(recentpump)	return
-		pump()
-		recentpump = 1
-		spawn(10)
-			recentpump = 0
-		return
-
-
-	proc/pump(mob/M as mob)
-		playsound(M, 'sound/weapons/shotgunpump.ogg', 60, 1)
-		pumped = 0
-		if(current_shell)//We have a shell in the chamber
-			current_shell.loc = get_turf(src)//Eject casing
-			current_shell = null
-			if(in_chamber)
-				in_chamber = null
-		if(!loaded.len)	return 0
-		var/obj/item/ammo_casing/AC = loaded[1] //load next casing.
-		loaded -= AC //Remove casing from loaded list.
-		current_shell = AC
-		if(AC.BB)
-			in_chamber = AC.BB //Load projectile into chamber.
-		update_icon()	//I.E. fix the desc
+	if(AC.BB)
+		if(AC.reagents && AC.BB.reagents)
+			var/datum/reagents/casting_reagents = AC.reagents
+			casting_reagents.trans_to(AC.BB, casting_reagents.total_volume) //For chemical darts
+			casting_reagents.delete()
+		in_chamber = AC.BB //Load projectile into chamber.
+		AC.BB.loc = src //Set projectile loc to gun.
+		AC.BB = null
+		AC.update_icon()
 		return 1
+	return 0
+
+
+/obj/item/weapon/gun/projectile/shotgun/pump/attack_self(mob/living/user as mob)
+	if(recentpump)	return
+	pump()
+	recentpump = 1
+	spawn(10)
+		recentpump = 0
+	return
+
+
+/obj/item/weapon/gun/projectile/shotgun/pump/proc/pump(mob/M as mob)
+	playsound(M, 'sound/weapons/shotgunpump.ogg', 60, 1)
+	pumped = 0
+	if(chambered)//We have a shell in the chamber
+		chambered.loc = get_turf(src)//Eject casing
+		chambered = null
+		if(in_chamber)
+			in_chamber = null
+	if(!magazine.ammo_count())	return 0
+	var/obj/item/ammo_casing/AC = magazine.get_round() //load next casing.
+	chambered = AC
+	update_icon()	//I.E. fix the desc
+	return 1
+
+/obj/item/weapon/gun/projectile/shotgun/pump/examine()
+	..()
+	if (chambered)
+		usr << "A [chambered.BB ? "live" : "spent"] one is in the chamber."

 /obj/item/weapon/gun/projectile/shotgun/pump/combat
 	name = "combat shotgun"
 	icon_state = "cshotgun"
-	max_shells = 8
 	origin_tech = "combat=5;materials=2"
-	ammo_type = "/obj/item/ammo_casing/shotgun"
+	ammo_type = /obj/item/ammo_casing/shotgun
+	mag_type = /obj/item/ammo_box/magazine/internal/shotcom
 	w_class = 5

-//this is largely hacky and bad :(	-Pete
-/obj/item/weapon/gun/projectile/shotgun/doublebarrel
+/obj/item/weapon/gun/projectile/revolver/doublebarrel
 	name = "double-barreled shotgun"
 	desc = "A true classic."
 	icon_state = "dshotgun"
 	item_state = "shotgun"
-	max_shells = 2
 	w_class = 4.0
 	force = 10
 	flags =  FPRINT | TABLEPASS | CONDUCT
 	slot_flags = SLOT_BACK
-	caliber = "shotgun"
 	origin_tech = "combat=3;materials=1"
-	ammo_type = "/obj/item/ammo_casing/shotgun/beanbag"
+	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
+	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/dualshot

-	New()
-		for(var/i = 1, i <= max_shells, i++)
-			loaded += new ammo_type(src)
-
-		update_icon()
-		return
-
-	load_into_chamber()
-//		if(in_chamber)
-//			return 1 {R}
-		if(!loaded.len)
-			return 0
-
-		var/obj/item/ammo_casing/AC = loaded[1] //load next casing.
-		loaded -= AC //Remove casing from loaded list.
-
-		if(AC.BB)
-			if(AC.reagents && AC.BB.reagents)
-				var/datum/reagents/casting_reagents = AC.reagents
-				casting_reagents.trans_to(AC.BB, casting_reagents.total_volume) //For chemical darts
-				casting_reagents.delete()
-			in_chamber = AC.BB //Load projectile into chamber.
-			AC.BB.loc = src //Set projectile loc to gun.
-			AC.BB = null //Remove the ammunition from the shell
-			AC.desc += " This one is spent."
-			return 1
-		return 0
-
-	attack_self(mob/living/user as mob)
-		if(!(locate(/obj/item/ammo_casing/shotgun) in src) && !loaded.len)
-			user << "<span class='notice'>\The [src] is empty.</span>"
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob)
+	..()
+	if (istype(A,/obj/item/ammo_box) || istype(A,/obj/item/ammo_casing))
+		chamber_round()
+	if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter))
+		user << "<span class='notice'>You begin to shorten the barrel of \the [src].</span>"
+		if(get_ammo())
+			afterattack(user, user)	//will this work?
+			afterattack(user, user)	//it will. we call it twice, for twice the FUN
+			playsound(user, fire_sound, 50, 1)
+			user.visible_message("<span class='danger'>The shotgun goes off!</span>", "<span class='danger'>The shotgun goes off in your face!</span>")
 			return
+		if(do_after(user, 30))	//SHIT IS STEALTHY EYYYYY
+			icon_state = "sawnshotgun"
+			w_class = 3.0
+			item_state = "gun"
+			slot_flags &= ~SLOT_BACK	//you can't sling it on your back
+			slot_flags |= SLOT_BELT		//but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
+			user << "<span class='warning'>You shorten the barrel of \the [src]!</span>"
+			name = "sawn-off shotgun"
+			desc = "Omar's coming!"

-		for(var/obj/item/ammo_casing/shotgun/shell in src)	//This feels like a hack.	//don't code at 3:30am kids!!
-			if(shell in loaded)
-				loaded -= shell
-			shell.loc = get_turf(src.loc)
-
-		user << "<span class='notice'>You open \the [src].</span>"
-		update_icon()
-
-	attackby(var/obj/item/A as obj, mob/user as mob)
-		if(istype(A, /obj/item/ammo_casing) && !load_method)
-			var/obj/item/ammo_casing/AC = A
-			if(AC.caliber == caliber && (loaded.len < max_shells) && (contents.len < max_shells))	//forgive me father, for i have sinned
-				user.drop_item()
-				AC.loc = src
-				loaded += AC
-				user << "<span class='notice'>You load a shell into \the [src]!</span>"
-		A.update_icon()
-		update_icon()
-		if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter))
-			user << "<span class='notice'>You begin to shorten the barrel of \the [src].</span>"
-			if(loaded.len)
-				afterattack(user, user)	//will this work?
-				afterattack(user, user)	//it will. we call it twice, for twice the FUN
-				playsound(user, fire_sound, 50, 1)
-				user.visible_message("<span class='danger'>The shotgun goes off!</span>", "<span class='danger'>The shotgun goes off in your face!</span>")
-				return
-			if(do_after(user, 30))	//SHIT IS STEALTHY EYYYYY
-				icon_state = "sawnshotgun"
-				w_class = 3.0
-				item_state = "gun"
-				slot_flags &= ~SLOT_BACK	//you can't sling it on your back
-				slot_flags |= SLOT_BELT		//but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
-				user << "<span class='warning'>You shorten the barrel of \the [src]!</span>"
-				name = "sawn-off shotgun"
-				desc = "Omar's coming!"
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/attack_self(mob/living/user as mob)
+	var/num_unloaded = 0
+	while (get_ammo() > 0)
+		var/obj/item/ammo_casing/CB
+		CB = magazine.get_round(0)
+		chambered = null
+		CB.loc = get_turf(src.loc)
+		CB.update_icon()
+		num_unloaded++
+	if (num_unloaded)
+		user << "<span class = 'notice'>You break open \the [src] and unload [num_unloaded] shell\s.</span>"
+	else
+		user << "<span class='notice'>[src] is empty.</span>"
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -1471,7 +1471,16 @@ datum/design/ammo_9mm
 	req_tech = list("combat" = 4, "materials" = 3)
 	build_type = PROTOLATHE
 	materials = list("$metal" = 3750, "$silver" = 100)
-	build_path = "/obj/item/ammo_magazine/c9mm"
+	build_path = "/obj/item/ammo_box/c9mm"
+
+datum/design/mag_smg
+	name = "Submachine Gun Magazine (9mm)"
+	desc = "A prototype magazine for the submachine gun."
+	id = "mag_smg"
+	req_tech = list("combat" = 4, "materials" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 3750, "$silver" = 100)
+	build_path = "/obj/item/ammo_box/magazine/msmg9mm"

 datum/design/stunshell
 	name = "Stun Shell"
--- a/code/unused/specops.dm
+++ b/code/unused/specops.dm
@@ -108,7 +108,7 @@ var/global/sent_strike_team = 0
 		A.real_name = "[commando_leader_rank] [commando_name]"
 	else
 		A.real_name = "[commando_rank] [commando_name]"
-	A.real_name = "[!leader_selected ? commando_rank : 
+	A.real_name = "[!leader_selected ? commando_rank :
 	A.copy_to(new_commando)

 	ready_dna(new_commando)
@@ -140,7 +140,7 @@ var/global/sent_strike_team = 0
 	equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(src), slot_back)
 	equip_to_slot_or_del(new /obj/item/weapon/storage/box(src), slot_in_backpack)

-	equip_to_slot_or_del(new /obj/item/ammo_magazine/a357(src), slot_in_backpack)
+	equip_to_slot_or_del(new /obj/item/ammo_box/a357(src), slot_in_backpack)
 	equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/regular(src), slot_in_backpack)
 	equip_to_slot_or_del(new /obj/item/weapon/storage/box/flashbangs(src), slot_in_backpack)
 	equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_in_backpack)
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -32,7 +32,7 @@ sieve = Game Master
 aranclanos = Game Master
 intigracy = Game Master
 dumpdavidson = Game Master
-kazeespada = Game Master
+kazeespada = Game Master
 malkevin = Game Master
 incoming = Game Master
 demas = Game Master
--- a/data/ban_unban_log.txt
+++ b/data/ban_unban_log.txt
--- a/data/mode.txt
+++ b/data/mode.txt
@@ -1 +0,0 @@
-extended
--- a/icons/obj/ammo.dmi
+++ b/icons/obj/ammo.dmi
--- a/icons/obj/gun.dmi
+++ b/icons/obj/gun.dmi
--- a/maps/MetaStation.v37G.II.dmm
+++ b/maps/MetaStation.v37G.II.dmm
@@ -124,7 +124,7 @@
 "act" = (/obj/machinery/door/airlock/glass_security{name = "Long-Term Cell 3"; req_access_txt = "2"},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison)
 "acu" = (/obj/machinery/door/airlock/glass_security{name = "Long-Term Cell 2"; req_access_txt = "2"},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison)
 "acv" = (/obj/machinery/door/airlock/glass_security{name = "Long-Term Cell 1"; req_access_txt = "2"},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison)
-"acw" = (/obj/structure/closet{name = "Contraband Locker"},/obj/item/weapon/contraband/poster,/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap,/obj/item/weapon/gun/projectile/deagle,/turf/simulated/floor{icon_state = "dark"},/area/security/warden)
+"acw" = (/obj/structure/closet{name = "Contraband Locker"},/obj/item/weapon/contraband/poster,/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap,/obj/item/weapon/gun/projectile/automatic/deagle,/turf/simulated/floor{icon_state = "dark"},/area/security/warden)
 "acx" = (/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/security/warden)
 "acy" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor,/area/security/warden)
 "acz" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/structure/cable/yellow,/turf/simulated/floor/plating,/area/security/brig)
@@ -4517,7 +4517,7 @@
 "bIS" = (/obj/machinery/door/airlock/highsecurity{name = "Secure Tech Storage"; req_access_txt = "19;23"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/storage/tech)
 "bIT" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/storage/tech)
 "bIU" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/maintenance/fore)
-"bIV" = (/obj/item/weapon/reagent_containers/food/drinks/shaker,/obj/item/weapon/gun/projectile/shotgun/doublebarrel,/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/crew_quarters/bar)
+"bIV" = (/obj/item/weapon/reagent_containers/food/drinks/shaker,/obj/item/weapon/gun/projectile/revolver/doublebarrel,/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/crew_quarters/bar)
 "bIW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
 "bIX" = (/obj/structure/stool/bed/chair,/obj/machinery/driver_button{id = "chapelgun"; name = "Chapel Mass Driver"; pixel_x = -25; pixel_y = -26},/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/chapel/main)
 "bIY" = (/obj/structure/stool/bed/chair,/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/chapel/main)
--- a/maps/RandomZLevels/stationCollision.dm
+++ b/maps/RandomZLevels/stationCollision.dm
@@ -68,29 +68,31 @@ obj/item/weapon/gun/energy/laser/retro/sc_retro
 	clumsy_check = 0 //No sense in having a harmless gun blow up in the clowns face

 //Syndicate silenced pistol. This definition is not necessary, it's just habit.
-/obj/item/weapon/gun/projectile/silenced/sc_silenced
+/obj/item/weapon/gun/projectile/automatic/silenced/sc_silenced

 //Make it so that these guns only spawn with a couple bullets... if any
-/obj/item/weapon/gun/projectile/silenced/sc_silenced/New()
-	for(var/ammo in loaded)
+/obj/item/weapon/gun/projectile/automatic/silenced/sc_silenced/New()
+	for(var/ammo in magazine.stored_ammo)
 		if(prob(95)) //95% chance
-			loaded -= ammo
+			magazine.stored_ammo -= ammo

 //Syndicate sub-machine guns.
 /obj/item/weapon/gun/projectile/automatic/c20r/sc_c20r

 /obj/item/weapon/gun/projectile/automatic/c20r/sc_c20r/New()
-	for(var/ammo in loaded)
+	..()
+	for(var/ammo in magazine.stored_ammo)
 		if(prob(95)) //95% chance
-			loaded -= ammo
+			magazine.stored_ammo -= ammo

 //Barman's shotgun
 /obj/item/weapon/gun/projectile/shotgun/pump/sc_pump

 /obj/item/weapon/gun/projectile/shotgun/pump/sc_pump/New()
-	for(var/ammo in loaded)
+	..()
+	for(var/ammo in magazine.stored_ammo)
 		if(prob(95)) //95% chance
-			loaded -= ammo
+			magazine.stored_ammo -= ammo

 //Lasers
 /obj/item/weapon/gun/energy/laser/practice/sc_laser
--- a/maps/tgstation.2.1.2.dmm
+++ b/maps/tgstation.2.1.2.dmm
@@ -1491,7 +1491,7 @@
 "aCJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/crew_quarters/theatre)
 "aCK" = (/turf/simulated/wall,/area/crew_quarters/bar)
 "aCL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/maintenance/fpmaint)
-"aCM" = (/obj/machinery/atmospherics/pipe/simple{pipe_color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/item/weapon/reagent_containers/food/drinks/shaker,/obj/item/weapon/gun/projectile/shotgun/doublebarrel,/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/crew_quarters/bar)
+"aCM" = (/obj/machinery/atmospherics/pipe/simple{pipe_color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/item/weapon/reagent_containers/food/drinks/shaker,/obj/item/weapon/gun/projectile/revolver/doublebarrel,/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/crew_quarters/bar)
 "aCN" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/wood,/area/crew_quarters/bar)
 "aCO" = (/obj/structure/sink/kitchen{pixel_y = 28},/turf/simulated/floor/wood,/area/crew_quarters/bar)
 "aCP" = (/obj/machinery/door/window/southleft{base_state = "left"; dir = 2; icon_state = "left"; name = "Bar Delivery"; req_access_txt = "25"},/turf/simulated/floor{icon_state = "delivery"},/area/crew_quarters/bar)
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6,6 +6,46 @@

 // BEGIN_FILE_DIR
 #define FILE_DIR .
+#define FILE_DIR "html"
+#define FILE_DIR "icons"
+#define FILE_DIR "icons/effects"
+#define FILE_DIR "icons/mecha"
+#define FILE_DIR "icons/misc"
+#define FILE_DIR "icons/mob"
+#define FILE_DIR "icons/obj"
+#define FILE_DIR "icons/obj/assemblies"
+#define FILE_DIR "icons/obj/atmospherics"
+#define FILE_DIR "icons/obj/clothing"
+#define FILE_DIR "icons/obj/doors"
+#define FILE_DIR "icons/obj/flora"
+#define FILE_DIR "icons/obj/machines"
+#define FILE_DIR "icons/obj/pipes"
+#define FILE_DIR "icons/obj/power_cond"
+#define FILE_DIR "icons/pda_icons"
+#define FILE_DIR "icons/spideros_icons"
+#define FILE_DIR "icons/stamp_icons"
+#define FILE_DIR "icons/Testing"
+#define FILE_DIR "icons/turf"
+#define FILE_DIR "icons/vending_icons"
+#define FILE_DIR "nano"
+#define FILE_DIR "nano/images"
+#define FILE_DIR "sound"
+#define FILE_DIR "sound/AI"
+#define FILE_DIR "sound/ambience"
+#define FILE_DIR "sound/effects"
+#define FILE_DIR "sound/hallucinations"
+#define FILE_DIR "sound/items"
+#define FILE_DIR "sound/machines"
+#define FILE_DIR "sound/mecha"
+#define FILE_DIR "sound/misc"
+#define FILE_DIR "sound/piano"
+#define FILE_DIR "sound/violin"
+#define FILE_DIR "sound/voice"
+#define FILE_DIR "sound/voice/complionator"
+#define FILE_DIR "sound/weapons"
+#define FILE_DIR "tools"
+#define FILE_DIR "tools/AddToChangelog"
+#define FILE_DIR "tools/AddToChangelog/AddToChangelog"
 // END_FILE_DIR

 // BEGIN_PREFERENCES
@@ -1072,6 +1112,7 @@
 #include "code\modules\projectiles\projectile.dm"
 #include "code\modules\projectiles\ammunition\boxes.dm"
 #include "code\modules\projectiles\ammunition\bullets.dm"
+#include "code\modules\projectiles\ammunition\magazines.dm"
 #include "code\modules\projectiles\guns\energy.dm"
 #include "code\modules\projectiles\guns\projectile.dm"
 #include "code\modules\projectiles\guns\energy\laser.dm"