Merge pull request #18 from ParadiseSS13/master

Merge from Master

code/datums/uplink_item.dm

@@ -205,28 +205,29 @@ var/list/uplink_items = list()
 /datum/uplink_item/dangerous
 	category = "Highly Visible and Dangerous Weapons"
 
-/datum/uplink_item/dangerous/revolver
-	name = "Fully Loaded Revolver"
-	desc = "A traditional handgun which fires .357 rounds. Has 7 chambers. Can down an unarmoured target with two shots."
-	item = /obj/item/weapon/gun/projectile/revolver
-	cost = 13
 
 /datum/uplink_item/dangerous/pistol
-	name = "Stechkin Pistol"
-	desc = "A small, easily concealable handgun that uses 10mm magazines and is compatible with suppressors."
+	name = "Syndicate Pistol"
+	desc = "A small, easily concealable handgun that uses 10mm auto rounds in 8-round magazines and is compatible with suppressors."
 	item = /obj/item/weapon/gun/projectile/automatic/pistol
 	cost = 9
 
+/datum/uplink_item/dangerous/revolver
+	name = "Syndicate Revolver"
+	desc = "A brutally simple syndicate revolver that fires .357 Magnum cartridges and has 7 chambers."
+	item = /obj/item/weapon/gun/projectile/revolver
+	cost = 13
+
 /datum/uplink_item/dangerous/smg
-	name = "C-20r Submachine Gun"
-	desc = "A fully-loaded Scarborough Arms-developed submachine gun that fires 12mm automatic rounds with a 20-round magazine."
+	name = "Syndicate SMG"
+	desc = "A fully-loaded Scarborough Arms bullpup submachine gun that fires .45 rounds with a 20-round magazine and is compatible with suppressors."
 	item = /obj/item/weapon/gun/projectile/automatic/c20r
 	cost = 14
 	gamemodes = list("nuclear emergency")
 
 /datum/uplink_item/dangerous/machinegun
-	name = "L6 Squad Automatic Weapon"
-	desc = "A traditionally constructed machine gun made by AA-2531. This deadly weapon has a massive 50-round magazine of 7.62×51mm ammunition."
+	name = "Syndicate LMG"
+	desc = "A fully-loaded Aussec Armoury belt-fed machine gun. This deadly weapon has a massive 50-round magazine of devastating 7.62x51mm ammunition."
 	item = /obj/item/weapon/gun/projectile/automatic/l6_saw
 	cost = 40
 	gamemodes = list("nuclear emergency")
@@ -304,53 +305,74 @@ var/list/uplink_items = list()
 /datum/uplink_item/ammo
 	category = "Ammunition"
 
-/datum/uplink_item/ammo/revolver
-	name = "Ammo-357"
-	desc = "A box that contains seven additional rounds for the revolver, made using an automatic lathe."
-	item = /obj/item/ammo_box/a357
-	cost = 4
-
 /datum/uplink_item/ammo/pistol
 	name = "Ammo-10mm"
-	desc = "An additional 8-round 10mm magazine for use in the Stetchkin pistol."
+	desc = "An additional 8-round 10mm magazine for use in the syndicate pistol. These subsonic rounds are dirt cheap but are half as effective as .357 rounds."
 	item = /obj/item/ammo_box/magazine/m10mm
 	cost = 1
 
+/datum/uplink_item/ammo/revolver
+	name = "Speed Loader - .357"
+	desc = "A speed loader that contains seven additional .357 Magnum rounds for the syndicate revolver. For when you really need a lot of things dead."
+	item = /obj/item/ammo_box/a357
+	cost = 4
+
 /datum/uplink_item/ammo/smg
-	name = "Ammo-12mm"
-	desc = "A 20-round 12mm magazine for use in the C-20r submachine gun."
-	item = /obj/item/ammo_box/magazine/m12mm
+	name = "Magazine - .45"
+	desc = "An additional 20-round .45 magazine for use in the C-20r submachine gun. These bullets pack a lot of punch that can knock most targets down, but do limited overall damage."
+	item = /obj/item/ammo_box/magazine/smgm45
 	cost = 2
 	gamemodes = list("nuclear emergency")
 
-/datum/uplink_item/ammo/machinegun
-	name = "Ammo-7.62×51mm"
-	desc = "A 50-round magazine of 7.62×51mm ammunition for use in the L6 SAW machinegun. By the time you need to use this, you'll already be on a pile of corpses."
-	item = /obj/item/ammo_box/magazine/m762
-	cost = 12
+/datum/uplink_item/dangerous/car
+	name = "C-90gl Compact Assault Rifle"
+	desc = "A fully-loaded Zashchita Industriya toploading bullpup assault rifle that uses 30-round 5.45x39mm magazines with a togglable underslung 40mm grenade launcher."
+	item = /obj/item/weapon/gun/projectile/automatic/c90gl
+	cost = 18
 	gamemodes = list("nuclear emergency")
 
 /datum/uplink_item/ammo/bullstun
-	name = "Ammo-12g Stun Slug"
+	name = "Drum Magazine - 12g Stun Slug"
 	desc = "An additional 8-round stun slug magazine for use in the Bulldog shotgun. Saying that they're non-lethal would be lying."
 	item = /obj/item/ammo_box/magazine/m12g
 	cost = 2
 	gamemodes = list("nuclear emergency")
 
 /datum/uplink_item/ammo/bullbuck
-	name = "Ammo-12g Buckshot"
+	name = "Drum Magazine - 12g Buckshot"
 	desc = "An alternative 8-round buckshot magazine for use in the Bulldog shotgun. Front towards enemy."
 	item = /obj/item/ammo_box/magazine/m12g/buckshot
 	cost = 2
 	gamemodes = list("nuclear emergency")
 
 /datum/uplink_item/ammo/bulldragon
-	name = "Ammo-12g Dragon's Breath"
+	name = "Drum Magazine - 12g Dragon's Breath"
 	desc = "An alternative 8-round dragon's breath magazine for use in the Bulldog shotgun. I'm a fire starter, twisted fire starter!"
 	item = /obj/item/ammo_box/magazine/m12g/dragon
 	cost = 3
 	gamemodes = list("nuclear emergency")
 
+/datum/uplink_item/ammo/car
+	name = "Box Magazine - 5.45x39mm"
+	desc = "An additional 30-round 5.45x39mm magazine for use in the C-90gl assault rifle. These bullets don't have the punch to knock most targets down, but dish out higher overall damage."
+	item = /obj/item/ammo_box/magazine/m545
+	cost = 2
+	gamemodes = list("nuclear emergency")
+
+/datum/uplink_item/ammo/a40mm
+	name = "Ammo Box - 40mm grenades"
+	desc = "A box of 4 additional 40mm HE grenades for use the C-90gl's underbarrel grenade launcher. Your teammates will thank you to not shoot these down small hallways."
+	item = /obj/item/ammo_box/a40mm
+	cost = 4
+	gamemodes = list("nuclear emergency")
+
+/datum/uplink_item/ammo/machinegun
+	name = "Box Magazine - 7.62×51mm"
+	desc = "A 50-round magazine of 7.62x51mm ammunition for use in the L6 SAW machinegun. By the time you need to use this, you'll already be on a pile of corpses."
+	item = /obj/item/ammo_box/magazine/m762
+	cost = 12
+	gamemodes = list("nuclear emergency")
+
 
 // STEALTHY WEAPONS
 
@@ -379,9 +401,9 @@ var/list/uplink_items = list()
 // Commented out until a fix can be found, currently doesn't work with the PDA NanoUI and people keep wasting Telecrystals on it. -- Dave
 
 /datum/uplink_item/stealthy_weapons/silencer
-	name = "Stetchkin Silencer"
-	desc = "Fitted for use on the Stetchkin pistol, this silencer will make its shots quieter when equipped onto it."
-	item = /obj/item/weapon/silencer
+	name = "Universal Suppressor"
+	desc = "Fitted for use on any small caliber weapon with a threaded barrel, this suppressor will silence the shots of the weapon for increased stealth and superior ambushing capability."
+	item = /obj/item/weapon/suppressor
 	cost = 3
 
 // STEALTHY TOOLS

code/game/area/Space Station 13 areas.dm

@@ -633,14 +633,17 @@ var/list/ghostteleportlocs = list()
 /area/xenos_station/transit
 	name = "\improper Hyperspace"
 	icon_state = "shuttle"
+	requires_power = 0
 
 /area/xenos_station/southwest
 	name = "\improper Aft Port Solars"
 	icon_state = "southwest"
+	requires_power = 0
 
 /area/xenos_station/northwest
 	name = "\improper Fore Port Solars"
 	icon_state = "northwest"
+	requires_power = 0
 
 /area/xenos_station/northeast
 	name = "\improper Fore Starboard Solars"
@@ -650,15 +653,18 @@ var/list/ghostteleportlocs = list()
 /area/xenos_station/southeast
 	name = "\improper Aft Starboard Solars"
 	icon_state = "southeast"
-
+	requires_power = 0
+	
 /area/xenos_station/north
 	name = "\improper West Landing Area"
 	icon_state = "north"
-
+	requires_power = 0
+	
 /area/xenos_station/south
 	name = "\improper East Landing Area"
 	icon_state = "south"
-
+	requires_power = 0
+	
 //PRISON
 /area/prison
 	name = "\improper Prison Station"

code/game/gamemodes/wizard/rightandwrong.dm

@@ -19,7 +19,7 @@
 			for(var/datum/objective/OBJ in H.mind.objectives)
 				H << "<B>Objective #[obj_count]</B>: [OBJ.explanation_text]"
 				obj_count++
-		var/randomizeguns = pick("taser","egun","laser","revolver","detective","smg","nuclear","deagle","gyrojet","pulse","silenced","cannon","doublebarrel","shotgun","combatshotgun","mateba","smg","uzi","crossbow","saw")
+		var/randomizeguns = pick("taser","egun","laser","revolver","detective","c20r","nuclear","deagle","gyrojet","pulse","silenced","cannon","doublebarrel","shotgun","combatshotgun","bulldog","mateba","sabr","crossbow","saw","car")
 		var/randomizemagic = pick("fireball","smoke","blind","mindswap","forcewall","knock","horsemask","charge","wandnothing", "wanddeath", "wandresurrection", "wandpolymorph", "wandteleport", "wanddoor", "wandfireball", "staffchange", "staffhealing", "armor", "scrying")
 		if(!summon_type)
 			switch (randomizeguns)
@@ -33,7 +33,7 @@
 					new /obj/item/weapon/gun/projectile/revolver(get_turf(H))
 				if("detective")
 					new /obj/item/weapon/gun/projectile/revolver/detective(get_turf(H))
-				if("smg")
+				if("c20r")
 					new /obj/item/weapon/gun/projectile/automatic/c20r(get_turf(H))
 				if("nuclear")
 					new /obj/item/weapon/gun/energy/gun/nuclear(get_turf(H))
@@ -45,7 +45,7 @@
 					new /obj/item/weapon/gun/energy/pulse_rifle(get_turf(H))
 				if("silenced")
 					new /obj/item/weapon/gun/projectile/automatic/pistol(get_turf(H))
-					new /obj/item/weapon/silencer(get_turf(H))
+					new /obj/item/weapon/suppressor(get_turf(H))
 				if("cannon")
 					new /obj/item/weapon/gun/energy/lasercannon(get_turf(H))
 				if("doublebarrel")
@@ -54,16 +54,18 @@
 					new /obj/item/weapon/gun/projectile/shotgun/(get_turf(H))
 				if("combatshotgun")
 					new /obj/item/weapon/gun/projectile/shotgun/combat(get_turf(H))
+				if("bulldog")
+					new /obj/item/weapon/gun/projectile/automatic/bulldog(get_turf(H))
 				if("mateba")
 					new /obj/item/weapon/gun/projectile/revolver/mateba(get_turf(H))
-				if("smg")
+				if("sabr")
 					new /obj/item/weapon/gun/projectile/automatic(get_turf(H))
-				if("uzi")
-					new /obj/item/weapon/gun/projectile/automatic/mini_uzi(get_turf(H))
 				if("crossbow")
 					new /obj/item/weapon/gun/energy/crossbow(get_turf(H))
 				if("saw")
 					new /obj/item/weapon/gun/projectile/automatic/l6_saw(get_turf(H))
+				if("car")
+					new /obj/item/weapon/gun/projectile/automatic/c90gl(get_turf(H))
 		else
 			switch (randomizemagic)
 				if("fireball")

code/game/gamemodes/xenos/xenos.dm

@@ -217,7 +217,7 @@
 /datum/game_mode/xenos/declare_completion()
 	if(result == 1)
 		feedback_set_details("round_end_result","win - xenos killed")
-		world << "<FONT size = 3><B>Crew Major Victory</B></FONT>"
+		world << "<FONT size = 3><B>Crew Victory</B></FONT>"
 		world << "<B>The aliens did not succeed and were exterminated by the crew!</B>"				
 	else if(result == 2)
 		feedback_set_details("round_end_result","win - crew killed")

code/game/jobs/access.dm

@@ -73,7 +73,7 @@
 /var/const/access_pilot = 71
 /var/const/access_ntrec = 72
 /var/const/access_ntrep = 73
-
+/var/const/access_magistrate = 74
 
 /var/const/access_weapons = 99 //Weapon authorization for secbots
 
@@ -237,7 +237,7 @@
 	            access_theatre, access_research, access_mining, access_mailsorting,
 	            access_heads_vault, access_mining_station, access_xenobiology, access_ce, access_hop, access_hos, access_RC_announce,
 	            access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_paramedic, access_blueshield, access_customs, access_mechanic,access_weapons,
-	            access_pilot, access_ntrec, access_ntrep)
+	            access_pilot, access_ntrec, access_ntrep, access_magistrate)
 
 /proc/get_all_centcom_access()
 	return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_medical, access_cent_living, access_cent_storage, access_cent_teleporter, access_cent_creed, access_cent_captain)
@@ -260,7 +260,7 @@
 		if(5) //command
 			return list(access_heads, access_RC_announce, access_keycard_auth, access_change_ids, access_ai_upload, access_teleporter, access_eva, access_tcomsat, access_gateway, access_all_personal_lockers, access_heads_vault, access_blueshield, access_ntrec, access_ntrep, access_hop, access_captain)
 		if(6) //station general
-			return list(access_kitchen,access_bar, access_hydroponics, access_janitor, access_chapel_office, access_crematorium, access_library, access_theatre, access_lawyer, access_clown, access_mime)
+			return list(access_kitchen,access_bar, access_hydroponics, access_janitor, access_chapel_office, access_crematorium, access_library, access_theatre, access_lawyer, access_magistrate, access_clown, access_mime)
 		if(7) //supply
 			return list(access_mailsorting, access_mining, access_mining_station, access_cargo, access_qm)
 
@@ -430,6 +430,8 @@
 			return "Mechanic Workshop"
 		if(access_pilot)
 			return "Security Pod Pilot"
+		if(access_magistrate)
+			return "Magistrate"
 		if(access_weapons)
 			return "Weapon Permit"
 

code/game/jobs/job/supervisor.dm

@@ -101,23 +101,23 @@
 	selection_color = "#ddddff"
 	idtype = /obj/item/weapon/card/id/centcom
 	req_admin_notify = 1
-	minimal_player_age = 10
+	minimal_player_age = 21
 	access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers,
 			            access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads,
 			            access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
 			            access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
 			            access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
-			            access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_ntrep)
+			            access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_ntrep)
 	minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers,
 			            access_medical, access_engine, access_ai_upload, access_eva, access_heads,
 			            access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
 			            access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
 			            access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
-			            access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_ntrep)
+			            access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_ntrep)
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
-		H.equip_or_collect(new /obj/item/device/radio/headset/heads/hop(H), slot_l_ear)
+		H.equip_or_collect(new /obj/item/device/radio/headset/heads/ntrep(H), slot_l_ear)
 		switch(H.backbag)
 			if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back)
 			if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
@@ -127,7 +127,7 @@
 		H.equip_or_collect(new /obj/item/weapon/lighter/zippo/fluff/nt_rep(H.back), slot_in_backpack)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/centcom/representative(H), slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/centcom(H), slot_shoes)
-		H.equip_or_collect(new /obj/item/device/pda/heads/hop(H), slot_wear_pda)
+		H.equip_or_collect(new /obj/item/device/pda/heads/ntrep(H), slot_wear_pda)
 		var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
 		L.imp_in = H
 		L.implanted = 1
@@ -146,7 +146,7 @@
 	selection_color = "#ddddff"
 	idtype = /obj/item/weapon/card/id/centcom
 	req_admin_notify = 1
-	minimal_player_age = 10
+	minimal_player_age = 21
 	access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers,
 			            access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads, access_change_ids,
 			            access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
@@ -162,7 +162,7 @@
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
-		H.equip_or_collect(new /obj/item/device/radio/headset/heads/hop(H), slot_l_ear)
+		H.equip_or_collect(new /obj/item/device/radio/headset/heads/ntrec(H), slot_l_ear)
 		switch(H.backbag)
 			if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back)
 			if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
@@ -171,7 +171,7 @@
 		H.equip_or_collect(new /obj/item/weapon/lighter/zippo/fluff/nt_rep(H.back), slot_in_backpack)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/centcom/representative(H), slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/centcom(H), slot_shoes)
-		H.equip_or_collect(new /obj/item/device/pda/heads/hop(H), slot_wear_pda)
+		H.equip_or_collect(new /obj/item/device/pda/heads/ntrec(H), slot_wear_pda)
 		var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
 		L.imp_in = H
 		L.implanted = 1
@@ -190,7 +190,7 @@
 	selection_color = "#ddddff"
 	idtype = /obj/item/weapon/card/id/centcom
 	req_admin_notify = 1
-	minimal_player_age = 10
+	minimal_player_age = 21
 	access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers,
 			            access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads,
 			            access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
@@ -206,7 +206,7 @@
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
-		H.equip_or_collect(new /obj/item/device/radio/headset/heads/hop(H), slot_l_ear)
+		H.equip_or_collect(new /obj/item/device/radio/headset/heads/blueshield(H), slot_l_ear)
 		switch(H.backbag)
 			if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack/security(H), slot_back)
 			if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
@@ -217,7 +217,7 @@
 		H.equip_or_collect(new /obj/item/clothing/glasses/hud/health_advanced, slot_glasses)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/centcom/blueshield(H), slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/suit/armor/vest/fluff/deus_blueshield(H), slot_wear_suit)
-		H.equip_or_collect(new /obj/item/device/pda/heads/hop(H), slot_wear_pda)
+		H.equip_or_collect(new /obj/item/device/pda/heads/blueshield(H), slot_wear_pda)
 		if(H.backbag == 1)
 			H.equip_or_collect(new /obj/item/weapon/storage/box/deathimp(H), slot_r_hand)
 		else
@@ -240,7 +240,7 @@
 	selection_color = "#ddddff"
 	idtype = /obj/item/weapon/card/id/centcom
 	req_admin_notify = 1
-	minimal_player_age = 10
+	minimal_player_age = 21
 	access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers,
 			            access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads,
 			            access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
@@ -251,7 +251,7 @@
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
-		H.equip_or_collect(new /obj/item/device/radio/headset/heads/hop(H), slot_l_ear)
+		H.equip_or_collect(new /obj/item/device/radio/headset/heads/magistrate(H), slot_l_ear)
 		switch(H.backbag)
 			if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back)
 			if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
@@ -261,7 +261,7 @@
 		H.equip_if_possible(new /obj/item/clothing/suit/judgerobe(H), slot_wear_suit)
 		H.equip_if_possible(new /obj/item/clothing/shoes/centcom(H), slot_shoes)
 		H.equip_or_collect(new /obj/item/clothing/head/powdered_wig(H), slot_head)
-		H.equip_or_collect(new /obj/item/device/pda/heads/hop(H), slot_wear_pda)
+		H.equip_or_collect(new /obj/item/device/pda/heads/magistrate(H), slot_wear_pda)
 		var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
 		L.imp_in = H
 		L.implanted = 1
@@ -279,8 +279,8 @@
 	spawn_positions = 2
 	supervisors = "the magistrate"
 	selection_color = "#ddddff"
-	access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels)
-	minimal_access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels)
+	access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels, access_magistrate)
+	minimal_access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels, access_magistrate)
 	alt_titles = list("Lawyer","Public Defender")
 	minimal_player_age = 21
 

code/game/machinery/autolathe.dm

@@ -62,8 +62,11 @@ var/global/list/autolathe_recipes_hidden = list( \
 		new /obj/item/weapon/handcuffs(), \
 		new /obj/item/weapon/hatchet(), \
 		new /obj/item/ammo_box/a357(), \
+		new /obj/item/ammo_box/c10mm(), \
+		new /obj/item/ammo_box/c45(), \
+		new /obj/item/ammo_box/c9mm(), \
 		new /obj/item/ammo_casing/shotgun(), \
-		new /obj/item/ammo_casing/shotgun/buck(), \
+		new /obj/item/ammo_casing/shotgun/buckshot(), \
 		new /obj/item/ammo_casing/shotgun/incendiary(), \
 		/*new /obj/item/ammo_casing/shotgun/dart(), \
 		new /obj/item/weapon/shield/riot(), */ \

code/game/machinery/bots/ed209bot.dm

@@ -44,8 +44,7 @@
 		/obj/item/weapon/gun/energy/laser/redtag,\
 		/obj/item/weapon/gun/energy/laser/practice,\
 		/obj/item/weapon/melee/telebaton,\
-		/obj/item/weapon/gun/energy/kinetic_accelerator,\
-		/obj/item/weapon/melee/baton/loaded/ntcane)
+		/obj/item/weapon/gun/energy/kinetic_accelerator)
 
 
 /obj/item/weapon/ed209_assembly

code/game/machinery/bots/secbot.dm

@@ -34,8 +34,7 @@
 		/obj/item/weapon/gun/energy/laser/redtag,\
 		/obj/item/weapon/gun/energy/laser/practice,\
 		/obj/item/weapon/melee/telebaton,\
-		/obj/item/weapon/gun/energy/kinetic_accelerator,\
-		/obj/item/weapon/melee/baton/loaded/ntcane)
+		/obj/item/weapon/gun/energy/kinetic_accelerator)
 
 
 /obj/machinery/bot/secbot/beepsky

code/game/machinery/computer/specops_shuttle.dm

@@ -246,7 +246,8 @@ var/specops_shuttle_timeleft = 0
 	return 1
 
 /obj/machinery/computer/specops_shuttle/attack_ai(var/mob/user as mob)
-	return attack_hand(user)
+	user << "\red Access Denied."
+	return 1
 
 /obj/machinery/computer/specops_shuttle/attack_paw(var/mob/user as mob)
 	return attack_hand(user)

code/game/machinery/computer/syndicate_specops_shuttle.dm

@@ -180,7 +180,8 @@ var/syndicate_elite_shuttle_timeleft = 0
 	return attack_hand(user)
 
 /obj/machinery/computer/syndicate_elite_shuttle/attack_ai(var/mob/user as mob)
-	return attack_hand(user)
+	user << "\red Access Denied."
+	return 1
 
 /obj/machinery/computer/syndicate_elite_shuttle/attack_paw(var/mob/user as mob)
 	return attack_hand(user)

code/game/machinery/computer/xenos_shuttle.dm

@@ -28,7 +28,20 @@
 		A.close()
 		if(dest_location == locate(/area/xenos_station/start))	
 			A.locked = 1
-			A.update_icon()		
+			A.update_icon()	
+
+	for(var/mob/M in curr_location)
+		if(M.client)
+			spawn(0)
+				if(M.buckled)
+					M << "\red Sudden acceleration presses you into your chair!"
+					shake_camera(M, 3, 1)
+				else
+					M << "\red The floor lurches beneath you!"
+					shake_camera(M, 10, 1)
+		if(istype(M, /mob/living/carbon) && !isalien(M))
+			if(!M.buckled)
+				M.Weaken(3)			
 	
 	if(curr_location.z != dest_location.z)
 		var/area/transit_location = locate(/area/xenos_station/transit)
@@ -41,6 +54,30 @@
 		if(dest_location != locate(/area/xenos_station/start))	
 			A.locked = 0
 			A.update_icon()	
+			
+	var/list/dstturfs = list()
+	var/throwy = world.maxy
+
+	for(var/turf/T in dest_location)
+		dstturfs += T
+		if(T.y < throwy)
+			throwy = T.y
+
+				// hey you, get out of the way!
+	for(var/turf/T in dstturfs)
+					// find the turf to move things to
+		var/turf/D = locate(T.x, throwy - 1, 1)
+					//var/turf/E = get_step(D, SOUTH)
+		for(var/atom/movable/AM as mob|obj in T)
+			AM.Move(D)
+		if(istype(T, /turf/simulated))
+			del(T)
+
+	for(var/mob/living/carbon/bug in dest_location) // If someone somehow is still in the shuttle's docking area...
+		bug.gib()
+
+	for(var/mob/living/simple_animal/pest in dest_location) // And for the other kind of bug...
+		pest.gib()
 		
 	curr_location.move_contents_to(dest_location)
 	curr_location = dest_location
@@ -62,21 +99,21 @@
 		user << "\red Access denied."
 		return
 		
-	if(!istype(user,/mob/living/carbon/alien) && !isrobot(user) && !isAI(user))
-		user << "You do not know how to operate this computer."
+	if(!isalien(user) && !isrobot(user) && !isAI(user))
+		user << "You do not know how to operate this terminal."
 		return
 
 	user.set_machine(src)
 
 	var/dat = {"Location: [curr_location]<br>
 	Ready to move[max(lastMove + XENOS_SHUTTLE_COOLDOWN - world.time, 0) ? " in [max(round((lastMove + XENOS_SHUTTLE_COOLDOWN - world.time) * 0.1), 0)] seconds" : ": now"]<br>
-	<a href='?src=\ref[src];xenos=1'>Xenos Space</a><br>
-	<a href='?src=\ref[src];station_nw=1'>North West of SS13</a> |
+	<a href='?src=\ref[src];xenos=1'>Alien Space</a><br>
+	<a href='?src=\ref[src];station_nw=1'>North-West of SS13</a> |
 	<a href='?src=\ref[src];station_n=1'>North of SS13</a> |
-	<a href='?src=\ref[src];station_ne=1'>North East of SS13</a><br>
-	<a href='?src=\ref[src];station_sw=1'>South West of SS13</a> |
+	<a href='?src=\ref[src];station_ne=1'>North-East of SS13</a><br>
+	<a href='?src=\ref[src];station_sw=1'>South-West of SS13</a> |
 	<a href='?src=\ref[src];station_s=1'>South of SS13</a> |
-	<a href='?src=\ref[src];station_se=1'>South East of SS13</a><br>
+	<a href='?src=\ref[src];station_se=1'>South-East of SS13</a><br>
 	<a href='?src=\ref[user];mach_close=computer'>Close</a>"}
 
 	user << browse(dat, "window=computer;size=575x450")

code/game/machinery/doors/airlock.dm

@@ -299,7 +299,7 @@
 		return
 		
 /obj/machinery/door/airlock/alien/attackby(C as obj, mob/user as mob)
-	if(istype(user,/mob/living/carbon/alien) || isrobot(user) || isAI(user))
+	if(isalien(user) || isrobot(user) || isAI(user))
 		..(C, user)	
 	else
 		user << "You do not know how to operate this airlock's mechanism."

code/game/machinery/doors/firedoor.dm

@@ -56,7 +56,7 @@
 	desc = "Emergency air-tight shutter, capable of sealing off breached areas."
 	icon = 'icons/obj/doors/DoorHazard.dmi'
 	icon_state = "door_open"
-	req_one_access = list(access_atmospherics, access_engine_equip)
+	req_one_access = list(access_atmospherics, access_engine)
 	opacity = 0
 	density = 0
 

code/game/mecha/equipment/weapons/weapons.dm

@@ -254,7 +254,7 @@
 	name = "LBX AC 10 \"Scattershot\""
 	icon_state = "mecha_scatter"
 	equip_cooldown = 20
-	projectile = /obj/item/projectile/bullet/midbullet12
+	projectile = /obj/item/projectile/bullet/midbullet
 	fire_sound = 'sound/weapons/Gunshot.ogg'
 	projectiles = 40
 	projectile_energy_cost = 25

code/game/objects/items/devices/PDA/PDA.dm

@@ -129,6 +129,22 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	icon_state = "pda-captain"
 	detonate = 0
 	//toff = 1
+	
+/obj/item/device/pda/heads/ntrep
+	default_cartridge = /obj/item/weapon/cartridge/supervisor
+	icon_state = "pda-h"
+	
+/obj/item/device/pda/heads/ntrec
+	default_cartridge = /obj/item/weapon/cartridge/supervisor
+	icon_state = "pda-h"
+	
+/obj/item/device/pda/heads/magistrate
+	default_cartridge = /obj/item/weapon/cartridge/supervisor
+	icon_state = "pda-h"
+	
+/obj/item/device/pda/heads/blueshield
+	default_cartridge = /obj/item/weapon/cartridge/hos
+	icon_state = "pda-h"
 
 /obj/item/device/pda/cargo
 	default_cartridge = /obj/item/weapon/cartridge/quartermaster

code/game/objects/items/devices/PDA/cart.dm

@@ -196,6 +196,17 @@
 	access_reagent_scanner = 1
 	access_status_display = 1
 	access_atmos = 1
+	
+/obj/item/weapon/cartridge/captain/New()
+	..()
+	spawn(5)
+		radio = new /obj/item/radio/integrated/beepsky(src)
+		
+/obj/item/weapon/cartridge/supervisor
+	name = "Easy-Record DELUXE"
+	icon_state = "cart-h"
+	access_status_display = 1
+	access_security = 1
 
 /obj/item/weapon/cartridge/syndicate
 	name = "Detomatix Cartridge"

code/game/objects/items/devices/radio/encryptionkey.dm

@@ -96,7 +96,28 @@
 /obj/item/device/encryptionkey/heads/hop
 	name = "Head of Personnel's Encryption Key"
 	icon_state = "hop_cypherkey"
-	channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 0)
+	channels = list("Supply" = 1, "Service" = 1, "Security" = 0, "Command" = 1)
+	
+/obj/item/device/encryptionkey/heads/ntrep
+	name = "Nanotrasen Representative's Encryption Key"
+	icon_state = "com_cypherkey"
+	channels = list("Command" = 1, "Security" = 0, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0, "Service" = 0)
+	
+/obj/item/device/encryptionkey/heads/ntrec
+	name = "Nanotrasen Recruiter's Encryption Key"
+	icon_state = "com_cypherkey"
+	channels = list("Command" = 1, "Security" = 0)
+	
+/obj/item/device/encryptionkey/heads/magistrate
+	name = "Magistrate's Encryption Key"
+	icon_state = "com_cypherkey"
+	channels = list("Command" = 1, "Security" = 1)	
+	
+/obj/item/device/encryptionkey/heads/blueshield
+	name = "Blueshield's Encryption Key"
+	icon_state = "com_cypherkey"
+	channels = list("Command" = 1, "Security" = 1)
+	
 /*
 /obj/item/device/encryptionkey/headset_mine
 	name = "Mining Radio Encryption Key"

code/game/objects/items/devices/radio/headset.dm

@@ -133,7 +133,7 @@
 
 /obj/item/device/radio/headset/heads/hop
 	name = "head of personnel's headset"
-	desc = "The headset of the guy who will one day be captain. Channels are as follows: :u - supply, :z - service, :c - command, :s - security"
+	desc = "The headset of the guy who will one day be captain. Channels are as follows: :u - supply, :z - service, :s - security, :c - command."
 	icon_state = "com_headset"
 	item_state = "headset"
 	keyslot2 = new /obj/item/device/encryptionkey/heads/hop
@@ -154,7 +154,7 @@
 */
 /obj/item/device/radio/headset/headset_cargo
 	name = "supply radio headset"
-	desc = "A headset used by the QM and his slaves. To access the supply channel, use :u."
+	desc = "A headset used by the cargo department. To access the supply channel, use :u."
 	icon_state = "cargo_headset"
 	item_state = "headset"
 	keyslot2 = new /obj/item/device/encryptionkey/headset_cargo
@@ -165,6 +165,34 @@
 	icon_state = "srv_headset"
 	item_state = "headset"
 	keyslot2 = new /obj/item/device/encryptionkey/headset_service
+	
+/obj/item/device/radio/headset/heads/ntrep
+	name = "nanotrasen representative's headset"
+	desc = "The headset of the Nanotrasen Representative. Channels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :z - service, :m - medical, :n - science."
+	icon_state = "com_headset"
+	item_state = "headset"
+	keyslot2 = new /obj/item/device/encryptionkey/heads/ntrep
+	
+/obj/item/device/radio/headset/heads/ntrec
+	name = "nanotrasen recruiter's headset"
+	desc = "The headset of the Nanotrasen Recruiter. Channels are as follows: :c - command, :s - security."
+	icon_state = "com_headset"
+	item_state = "headset"
+	keyslot2 = new /obj/item/device/encryptionkey/heads/ntrec
+	
+/obj/item/device/radio/headset/heads/magistrate
+	name = "magistrate's headset"
+	desc = "The headset of the Magistrate. Channels are as follows: :c - command, :s - security."
+	icon_state = "com_headset"
+	item_state = "headset"
+	keyslot2 = new /obj/item/device/encryptionkey/heads/magistrate	
+	
+/obj/item/device/radio/headset/heads/blueshield
+	name = "blueshield's headset"
+	desc = "The headset of the Blueshield. Channels are as follows: :c - command, :s - security."
+	icon_state = "com_headset"
+	item_state = "headset"
+	keyslot2 = new /obj/item/device/encryptionkey/heads/blueshield
 
 /obj/item/device/radio/headset/ert
 	name = "CentCom Response Team headset"

code/game/objects/items/weapons/storage/boxes.dm

@@ -152,23 +152,6 @@
 		new /obj/item/weapon/dnainjector/m2h(src)
 		new /obj/item/weapon/dnainjector/m2h(src)
 
-
-/obj/item/weapon/storage/box/blanks
-	name = "box of birdshot shells"
-	desc = "It has a picture of a gun and several warning symbols on the front."
-	m_amt = 41000
-
-	New()
-		..()
-		new /obj/item/ammo_casing/shotgun/birdshot(src)
-		new /obj/item/ammo_casing/shotgun/birdshot(src)
-		new /obj/item/ammo_casing/shotgun/birdshot(src)
-		new /obj/item/ammo_casing/shotgun/birdshot(src)
-		new /obj/item/ammo_casing/shotgun/birdshot(src)
-		new /obj/item/ammo_casing/shotgun/birdshot(src)
-		new /obj/item/ammo_casing/shotgun/birdshot(src)
-
-
 /obj/item/weapon/storage/box/gauge
 	name = "box of 12 gauge slugs"
 	desc = "It has a picture of a gun and several warning symbols on the front."

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -18,7 +18,7 @@
 
 			if("bond")
 				new /obj/item/weapon/gun/projectile/automatic/pistol(src)
-				new /obj/item/weapon/silencer(src)
+				new /obj/item/weapon/suppressor(src)
 				new /obj/item/ammo_box/magazine/m10mm(src)
 				new /obj/item/ammo_box/magazine/m10mm(src)
 				new /obj/item/clothing/under/chameleon(src)

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -69,7 +69,7 @@
 
 /obj/structure/closet/secure_closet/engineering_welding
 	name = "Welding Supplies"
-	req_access = list(access_construction)
+	req_access = list(access_engine_equip)
 	icon_state = "secureengweld1"
 	icon_closed = "secureengweld"
 	icon_locked = "secureengweld1"
@@ -122,6 +122,7 @@
 		new /obj/item/weapon/cartridge/engineering(src)
 		new /obj/item/taperoll/engineering(src)
 		return
+		
 /obj/structure/closet/secure_closet/atmos_personal
 	name = "Technician's Locker"
 	req_access = list(access_atmospherics)
@@ -146,12 +147,17 @@
 			new /obj/item/clothing/tie/storage/webbing(src)
 		new /obj/item/clothing/suit/fire/firefighter(src)
 		new /obj/item/clothing/head/hardhat/red(src)
+		new /obj/item/clothing/gloves/black(src)
+		new /obj/item/weapon/storage/belt/utility(src)
 		new /obj/item/device/flashlight(src)
 		new /obj/item/weapon/extinguisher(src)
 		new /obj/item/device/radio/headset/headset_eng(src)
 		new /obj/item/clothing/suit/storage/hazardvest(src)
+		new /obj/item/weapon/storage/belt/utility(src)
 		new /obj/item/clothing/mask/gas(src)
 		new /obj/item/clothing/glasses/meson(src)
 		new /obj/item/weapon/cartridge/atmos(src)
 		new /obj/item/taperoll/engineering(src)
+		new /obj/item/weapon/storage/toolbox/mechanical(src)
+		
 		return

code/game/objects/structures/crates_lockers/closets/utility_closets.dm

@@ -229,19 +229,4 @@
 	if(!opened)
 		icon_state = icon_closed
 	else
-		icon_state = icon_opened
-
-/obj/structure/closet/ammunitionlocker
-	name = "ammunition locker"
-
-/obj/structure/closet/ammunitionlocker/New()
-	..()
-	sleep(2)
-	new /obj/item/ammo_casing/shotgun/beanbag(src)
-	new /obj/item/ammo_casing/shotgun/beanbag(src)
-	new /obj/item/ammo_casing/shotgun/beanbag(src)
-	new /obj/item/ammo_casing/shotgun/beanbag(src)
-	new /obj/item/ammo_casing/shotgun/beanbag(src)
-	new /obj/item/ammo_casing/shotgun/beanbag(src)
-	new /obj/item/ammo_casing/shotgun/beanbag(src)
-	new /obj/item/ammo_casing/shotgun/beanbag(src)
+		icon_state = icon_opened

code/game/objects/structures/inflatable.dm

@@ -297,6 +297,7 @@
 	icon_state = "inf_box"
 	item_state = "syringe_kit"
 	max_combined_w_class = 21
+	w_class = 3
 
 	New()
 		..()

code/game/turfs/simulated/floor_types.dm

@@ -120,7 +120,17 @@
 /turf/simulated/floor/greengrid
 	icon = 'icons/turf/floors.dmi'
 	icon_state = "gcircuit"
+	
+/turf/simulated/floor/greengrid/airless
+	icon_state = "gcircuit"
+	name = "airless floor"
+	oxygen = 0.01
+	nitrogen = 0.01
+	temperature = TCMB
 
+	New()
+		..()
+		name = "floor"
 
 /turf/simulated/shuttle
 	name = "shuttle"

code/game/turfs/simulated/walls_mineral.dm

@@ -78,7 +78,7 @@
 
 /turf/simulated/wall/mineral/plasma
 	name = "plasma wall"
-	desc = "A wall with plasma plating. This is definately a bad idea."
+	desc = "A wall with plasma plating. This is definitely a bad idea."
 	icon_state = "plasma0"
 	walltype = "plasma"
 	mineral = "plasma"
@@ -144,3 +144,10 @@
 		if(shocked)
 			shock()
 */
+
+/turf/simulated/wall/mineral/alien
+	name = "alien wall"
+	desc = "An strange-looking alien wall."
+	icon_state = "plasma0"
+	walltype = "plasma"
+	mineral = "plasma"

code/modules/clothing/clothing.dm

@@ -181,6 +181,49 @@ BLIND     // can't see anything
 	set src in usr
 	..()
 	return
+	
+/obj/item/clothing/under/proc/set_sensors(mob/usr as mob)
+	var/mob/M = usr
+	if (istype(M, /mob/dead/)) return
+	if (usr.stat || usr.restrained()) return
+	if(has_sensor >= 2)
+		usr << "The controls are locked."
+		return 0
+	if(has_sensor <= 0)
+		usr << "This suit does not have any sensors."
+		return 0
+
+	var/list/modes = list("Off", "Binary sensors", "Vitals tracker", "Tracking beacon")
+	var/switchMode = input("Select a sensor mode:", "Suit Sensor Mode", modes[sensor_mode + 1]) in modes
+	if(get_dist(usr, src) > 1)
+		usr << "You have moved too far away."
+		return
+	sensor_mode = modes.Find(switchMode) - 1
+
+	if (src.loc == usr)
+		switch(sensor_mode)
+			if(0)
+				usr << "You disable your suit's remote sensing equipment."
+			if(1)
+				usr << "Your suit will now report whether you are live or dead."
+			if(2)
+				usr << "Your suit will now report your vital lifesigns."
+			if(3)
+				usr << "Your suit will now report your vital lifesigns as well as your coordinate position."
+	else if (istype(src.loc, /mob))
+		switch(sensor_mode)
+			if(0)
+				for(var/mob/V in viewers(usr, 1))
+					V.show_message("\red [usr] disables [src.loc]'s remote sensing equipment.", 1)
+			if(1)
+				for(var/mob/V in viewers(usr, 1))
+					V.show_message("[usr] turns [src.loc]'s remote sensors to binary.", 1)
+			if(2)
+				for(var/mob/V in viewers(usr, 1))
+					V.show_message("[usr] sets [src.loc]'s sensors to track vitals.", 1)
+			if(3)
+				for(var/mob/V in viewers(usr, 1))
+					V.show_message("[usr] sets [src.loc]'s sensors to maximum.", 1)
 
 //Head
 /obj/item/clothing/head

code/modules/events/tgevents/vent_clog.dm

@@ -24,7 +24,7 @@
 		var/list/gunk = list("water","carbon","flour","radium","toxin","cleaner","nutriment","condensedcapsaicin","psilocybin","lube",
 							"plantbgone","banana","anti_toxin","space_drugs","hyperzine","holywater","ethanol","hot_coco","pacid",
 							"blood","stoxin","fluorine","ryetalyn","mutagen","oxycodone","fuel","cryptobiolin",
-							"impedrezene","mindbreaker","nanites","xenomicrobes","lipozine","frostoil","doctorsdelight","beepskysmash",
+							"impedrezene","mindbreaker","nanites","lipozine","frostoil","doctorsdelight","beepskysmash",
 							"tricordrazine", "amatoxin", "adminordrazine", "neurotoxin", "zombiepowder", "synaptizine")
 		var/datum/reagents/R = new/datum/reagents(50)
 		R.my_atom = vent

code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm

@@ -24,14 +24,24 @@ Doesn't work on other aliens/AI.*/
 	set category = "Alien"
 
 	if(locate(/obj/effect/alien/weeds/node) in get_turf(src))
-		src << "There's already a weed node here."
+		src << "<span class='noticealien'>There's already a weed node here.</span>"
 		return	
+		
+	if(constructing)
+		src << "<span class='noticealien'>You are already constructing something.</span>"
+		return
 	
 	if(powerc(50,1))
-		adjustToxLoss(-50)
-		for(var/mob/O in viewers(src, null))
-			O.show_message(text("<span class='alertalien'>[src] has planted some alien weeds!</span>"), 1)
-		new /obj/effect/alien/weeds/node(loc)
+		constructing = 1
+		stunned = 5
+		src << "<span class='noticealien'>You start planting a weed node.</span>"			
+		spawn(30)
+			adjustToxLoss(-50)
+			for(var/mob/O in viewers(src, null))
+				O.show_message(text("<span class='alertalien'>[src] has planted some alien weeds!</span>"), 1)
+			new /obj/effect/alien/weeds/node(loc)
+			constructing = 0
+			stunned = 0
 	return
 
 /mob/living/carbon/alien/humanoid/verb/whisp(mob/M as mob in oview())

code/modules/mob/living/carbon/alien/humanoid/empress.dm

@@ -80,7 +80,7 @@
 	set category = "Alien"	
 	
 	if(locate(/obj/effect/alien/egg) in get_turf(src))
-		src << "There's already an egg here."
+		src << "<span class='noticealien'>There's already an egg here.</span>"
 		return
 		
 	if(constructing)

code/modules/mob/living/carbon/alien/humanoid/queen.dm

@@ -62,7 +62,7 @@
 	set desc = "Lay an egg to produce huggers to impregnate prey with."
 	set category = "Alien"
 	if(locate(/obj/effect/alien/egg) in get_turf(src))
-		src << "There's already an egg here."
+		src << "<span class='noticealien'>There's already an egg here.</span>"
 		return
 		
 	if(constructing)
@@ -120,7 +120,7 @@
 
 		if(no_queen)
 			adjustToxLoss(-1000)
-			src << "\green You begin to evolve!"
+			src << "<span class='noticealien'>You begin to evolve!</span>"
 			for(var/mob/O in viewers(src, null))
 				O.show_message(text("\green <B>[src] begins to twist and contort!</B>"), 1)
 			var/mob/living/carbon/alien/humanoid/empress/new_xeno = new (loc)

code/modules/mob/living/carbon/alien/larva/larva.dm

@@ -4,8 +4,8 @@
 	icon_state = "larva0"
 	pass_flags = PASSTABLE
 
-	maxHealth = 25
-	health = 25
+	maxHealth = 30
+	health = 30
 	storedPlasma = 50
 	max_plasma = 50
 	density = 0

code/modules/mob/living/carbon/alien/powers.dm

@@ -1,5 +1,5 @@
 /mob/living/carbon/alien/verb/alien_ventcrawl() // -- TLE
-	set name = "Crawl through vent"
+	set name = "Crawl through vent (alien)"
 	set desc = "Enter an air vent and crawl through the pipe system."
 	set category = "Alien"
 	handle_ventcrawl()

code/modules/mob/living/carbon/human/human.dm

@@ -482,6 +482,10 @@
 
 
 /mob/living/carbon/human/show_inv(mob/user as mob)
+	var/obj/item/clothing/under/suit = null
+	if (istype(w_uniform, /obj/item/clothing/under))
+		suit = w_uniform
+
 	var/obj/item/clothing/gloves/G
 	var/pickpocket = 0
 	if(ishuman(user))
@@ -501,19 +505,21 @@
 	<BR><B>Right Ear:</B> <A href='?src=\ref[src];item=r_ear'>[(r_ear ? r_ear : "Nothing")]</A>
 	<BR><B>Head:</B> <A href='?src=\ref[src];item=head'>[(head ? head : "Nothing")]</A>
 	<BR><B>Shoes:</B> <A href='?src=\ref[src];item=shoes'>[(shoes ? shoes : "Nothing")]</A>
-	<BR><B>Belt:</B> <A href='?src=\ref[src];item=belt'>[(belt ? belt : "Nothing")]</A>
-	<BR><B>Uniform:</B> <A href='?src=\ref[src];item=uniform'>[(w_uniform ? w_uniform : "Nothing")]</A>
+	<BR><B>Belt:</B> <A href='?src=\ref[src];item=belt'>[(belt ? belt : "Nothing")]</A> [((istype(wear_mask, /obj/item/clothing/mask) && istype(belt, /obj/item/weapon/tank) && !( internal )) ? text(" <A href='?src=\ref[];item=internal'>Set Internal</A>", src) : "")]
+	<BR><B>Uniform:</B> <A href='?src=\ref[src];item=uniform'>[(w_uniform ? w_uniform : "Nothing")]</A> [(suit) ? ((suit.has_sensor == 1) ? text(" <A href='?src=\ref[];item=sensor'>Sensors</A>", src) : "") :]
 	<BR><B>(Exo)Suit:</B> <A href='?src=\ref[src];item=suit'>[(wear_suit ? wear_suit : "Nothing")]</A>
 	<BR><B>Back:</B> <A href='?src=\ref[src];item=back'>[(back ? back : "Nothing")]</A> [((istype(wear_mask, /obj/item/clothing/mask) && istype(back, /obj/item/weapon/tank) && !( internal )) ? text(" <A href='?src=\ref[];item=internal'>Set Internal</A>", src) : "")]
 	<BR><B>ID:</B> <A href='?src=\ref[src];item=id'>[(wear_id ? wear_id : "Nothing")]</A>
 	<BR><B>PDA:</B> <A href='?src=\ref[src];item=pda'>[(wear_pda ? wear_pda : "Nothing")]</A>
 	<BR><B>Suit Storage:</B> <A href='?src=\ref[src];item=s_store'>[(s_store ? s_store : "Nothing")]</A>
-	<BR>[(handcuffed ? text("<A href='?src=\ref[src];item=handcuff'>Handcuffed</A>") : text("<A href='?src=\ref[src];item=handcuff'>Not Handcuffed</A>"))]
-	<BR>[(legcuffed ? text("<A href='?src=\ref[src];item=legcuff'>Legcuffed</A>") : text(""))]
-	<BR>[(internal ? text("<A href='?src=\ref[src];item=internal'>Remove Internal</A>") : "")]
-	<BR><A href='?src=\ref[src];item=splints'>Remove Splints</A>
 	<BR><BR><A href='?src=\ref[src];pockets=left'>Left Pocket ([l_store ? (pickpocket ? l_store.name : "Full") : "Empty"])</A>
 	<BR><A href='?src=\ref[src];pockets=right'>Right Pocket ([r_store ? (pickpocket ? r_store.name : "Full") : "Empty"])</A>
+	<BR><A href='?src=\ref[src];item=pockets'>Empty Both Pockets</A>		
+	<BR><BR>[(handcuffed ? text("<A href='?src=\ref[src];item=handcuff'>Handcuffed</A>") : text("<A href='?src=\ref[src];item=handcuff'>Not Handcuffed</A>"))]
+	<BR>[(legcuffed ? text("<A href='?src=\ref[src];item=legcuff'>Legcuffed</A>") : text(""))]
+	[(suit) ? ((suit.hastie) ? text("<BR><A href='?src=\ref[];item=tie'>Remove Accessory</A>", src) : "") :]
+	[(internal ? text("<BR><A href='?src=\ref[src];item=internal'>Remove Internal</A>") : "")]	
+	<BR><A href='?src=\ref[src];item=splints'>Remove Splints</A>
 	<BR><A href='?src=\ref[user];refresh=1'>Refresh</A>
 	<BR><A href='?src=\ref[user];mach_close=mob\ref[src]'>Close</A>
 	<BR>"}

code/modules/mob/living/carbon/human/inventory.dm

@@ -546,6 +546,17 @@
 				return
 			else
 				message = "\red <B>[source] is trying to take off \a [target.w_uniform] from [target]'s body!</B>"
+		if("tie")
+			var/obj/item/clothing/under/suit = target.w_uniform
+			target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their accessory ([suit.hastie]) removed by [source.name] ([source.ckey])</font>")
+			source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to remove [target.name]'s ([target.ckey]) accessory ([suit.hastie])</font>")
+			if(istype(suit.hastie, /obj/item/clothing/tie/holobadge) || istype(suit.hastie, /obj/item/clothing/tie/medal))
+				for(var/mob/M in viewers(target, null))
+					M.show_message("\red <B>[source] tears off \the [suit.hastie] from [target]'s suit!</B>" , 1)
+				done()
+				return
+			else
+				message = "\red <B>[source] is trying to take off \a [suit.hastie] from [target]'s suit!</B>"
 		if("s_store")
 			target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their suit storage item ([target.s_store]) removed by [source.name] ([source.ckey])</font>")
 			source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to remove [target.name]'s ([target.ckey]) suit storage item ([target.s_store])</font>")
@@ -582,6 +593,14 @@
 				message = "\red <B>[source] is trying to set on [target]'s internals.</B>"
 		if("splints")
 			message = "\red <B>[source] is trying to remove [target]'s splints!</B>"
+		if("sensor")
+			target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their sensors toggled by [source.name] ([source.ckey])</font>")
+			source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to toggle [target.name]'s ([target.ckey]) sensors</font>")
+			var/obj/item/clothing/under/suit = target.w_uniform
+			if (suit.has_sensor >= 2)
+				source << "The controls are locked."
+				return
+			message = "\red <B>[source] is trying to set [target]'s suit sensors!</B>"
 
 	for(var/mob/M in viewers(target, null))
 		if(findtext(message, "is trying to take off  from", 1, 0) > 0 || message == null)
@@ -676,6 +695,17 @@ It can still be worn/put on as normal.
 			slot_to_process = slot_wear_suit
 			if (target.wear_suit && target.wear_suit.canremove)
 				strip_item = target.wear_suit
+		if("tie")
+			var/obj/item/clothing/under/suit = target.w_uniform
+			var/obj/item/clothing/tie/tie = suit.hastie
+			if(tie)
+				if (istype(tie,/obj/item/clothing/tie/storage))
+					var/obj/item/clothing/tie/storage/W = tie
+					if (W.hold)
+						W.hold.close(usr)
+				usr.put_in_hands(tie)
+				suit.hastie = null
+			target.update_inv_w_uniform()
 		if("id")
 			slot_to_process = slot_wear_id
 			if (target.wear_id)
@@ -733,6 +763,13 @@ It can still be worn/put on as normal.
 		if("pockets")
 			slot_to_process = slot_l_store
 			strip_item = target.l_store		//We'll do both
+		if("sensor")
+			var/obj/item/clothing/under/suit = target.w_uniform
+			if (suit)
+				if(suit.has_sensor >= 2)
+					source << "The controls are locked."
+				else
+					suit.set_sensors(source)
 		if("internal")
 			if (target.internal)
 				target.internal.add_fingerprint(source)

code/modules/mob/living/simple_animal/hostile/syndicate.dm

@@ -107,9 +107,9 @@
 	minimum_distance = 5
 	icon_state = "syndicateranged"
 	icon_living = "syndicateranged"
-	casingtype = /obj/item/ammo_casing/a12mm
+	casingtype = /obj/item/ammo_casing/c45
 	projectilesound = 'sound/weapons/Gunshot_smg.ogg'
-	projectiletype = /obj/item/projectile/bullet/midbullet12
+	projectiletype = /obj/item/projectile/bullet/midbullet2
 
 	weapon1 = /obj/item/weapon/gun/projectile/automatic/c20r
 

code/modules/mob/living/simple_animal/vox.dm

@@ -147,8 +147,8 @@
 	name = "strange armour"
 	desc = "Hulking reinforced armour for something huge."
 	icon = 'icons/obj/clothing/suits.dmi'
-	icon_state = "armalis_armour"
-	item_state = "armalis_armour"
+	icon_state = "armour-armalis"
+	item_state = "armour-armalis"
 
 /obj/item/vox/armalis_amp
 

code/modules/paperwork/paper.dm

@@ -556,11 +556,11 @@
 	
 /obj/item/weapon/paper/blueshield
 	name = "paper- 'Blueshield Mission Briefing'"
-	info = "<b>Blueshield Mission Briefing</b><br>You are charged with the defense of any persons of importance within the station. This includes but is not limited to The Captain, The Heads of Staff and Central Command staff. You answer directly to the Head of Security who will assist you in achieving your mission.<br>Where required to achieve your primary responsibility you should liase with security and share resources, however the day to day security operations of the station are outside of your jurisdiction.<br>Monitor the health and safety of your principals, identify any potential risks and threats then alert the proper departments to resolve the situation. You are authorized to act as bodyguard to any of the station heads that you determine are most in need of protection, however additional access to their departments shall be granted solely at their discretion.<br>Observe the station alert system and carry your armaments only as required by the situation or when authorized by the Head of Security or Captain in exceptional cases.<br>Remember, as an agent of Nanotransen it is your responsibility to conduct yourself appropriately and you will be held to the highest standard. You will be held accountable for your actions. Security is authorized to search, interrogate or detain you as required by their own procedures. Internal affairs will also monitor and observe your conduct and their mandate applies equally to security and blueshield operations."	
+	info = "<b>Blueshield Mission Briefing</b><br>You are charged with the defence of any persons of importance within the station. This includes but is not limited to The Captain, The Heads of Staff and Central Command staff. You answer directly to the Head of Security who will assist you in achieving your mission.<br>Where required to achieve your primary responsibility you should liaise with security and share resources, however the day to day security operations of the station are outside of your jurisdiction.<br>Monitor the health and safety of your principals, identify any potential risks and threats then alert the proper departments to resolve the situation. You are authorized to act as bodyguard to any of the station heads that you determine are most in need of protection, however additional access to their departments shall be granted solely at their discretion.<br>Observe the station alert system and carry your armaments only as required by the situation or when authorized by the Head of Security or Captain in exceptional cases.<br>Remember, as an agent of Nanotrasen it is your responsibility to conduct yourself appropriately and you will be held to the highest standard. You will be held accountable for your actions. Security is authorized to search, interrogate or detain you as required by their own procedures. Internal affairs will also monitor and observe your conduct and their mandate applies equally to security and Blueshield operations."	
 	
 /obj/item/weapon/paper/ntrep
 	name = "paper- 'Nanotrasen Representative Mission Briefing'"
-	info = "<b>Nanotrasen Representative Mission Briefing</b><br><br>Nanotransen Central Command has dispatched you to this station in order to liase with command staff on their behalf. As experienced field officers, the staff on the station are experts in handling their own fields. It is your job however to consider the bigger picture and to direct the staff towards Nanotransen's corporate interests.<br>As a civilian, you should consider yourself an advisor, diplomat and intermediary. The command staff do not answer to you directly and are not required to follow your orders nor do you have disciplinary authority over personnel. In all station internal matters you answer to the Head of Personnel who will direct you in your conduct within the station. However you also answer to Central Command who may, as required, direct you in acting on company interests.<br>Central Command may dispatch orders to the staff through you which you are responsible to communicate, however enforcement of these orders is not your mandate and will be handled directly by Central Command or authorized nanotransen personnel. When not specifically directed by Central Command, assist the head of personnel in evaluation of the station and receiving departmental reports.<br>Your office has been provided with a direct link to Central Command, through which you can issue any urgent reports or requests for Nanotrasen intervention. Remember that any direct intervention is a costly exercise and should be used only when the situation justifies the request. You will be held accountable for any unnecessary usage of Nanotransen resources.<br>"
+	info = "<b>Nanotrasen Representative Mission Briefing</b><br><br>Nanotrasen Central Command has dispatched you to this station in order to liaise with command staff on their behalf. As experienced field officers, the staff on the station are experts in handling their own fields. It is your job however to consider the bigger picture and to direct the staff towards Nanotrasen's corporate interests.<br>As a civilian, you should consider yourself an advisor, diplomat and intermediary. The command staff do not answer to you directly and are not required to follow your orders nor do you have disciplinary authority over personnel. In all station internal matters you answer to the Head of Personnel who will direct you in your conduct within the station. However you also answer to Central Command who may, as required, direct you in acting on company interests.<br>Central Command may dispatch orders to the staff through you which you are responsible to communicate, however enforcement of these orders is not your mandate and will be handled directly by Central Command or authorized Nanotrasen personnel. When not specifically directed by Central Command, assist the head of personnel in evaluation of the station and receiving departmental reports.<br>Your office has been provided with a direct link to Central Command, through which you can issue any urgent reports or requests for Nanotrasen intervention. Remember that any direct intervention is a costly exercise and should be used only when the situation justifies the request. You will be held accountable for any unnecessary usage of Nanotrasen resources.<br>"
 	
 /obj/item/weapon/paper/armory
 	name = "paper- 'Armory Inventory'"

code/modules/projectiles/ammunition.dm

@@ -95,7 +95,7 @@
 			return 1
 	return 0
 
-/obj/item/ammo_box/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/ammo_box/attackby(var/obj/item/A as obj, mob/user as mob, var/silent = 0)
 	var/num_loaded = 0
 	if(istype(A, /obj/item/ammo_box))
 		var/obj/item/ammo_box/AM = A
@@ -113,17 +113,25 @@
 			AC.loc = src
 			num_loaded++
 	if(num_loaded)
-		user << "<span class='notice'>You load [num_loaded] shell\s into \the [src]!</span>"
+		if(!silent)
+			user << "<span class='notice'>You load [num_loaded] shell\s into \the [src]!</span>"
 		A.update_icon()
 		update_icon()
 
+/obj/item/ammo_box/attack_self(mob/user as mob)
+	var/obj/item/ammo_casing/A = get_round()
+	if(A)
+		user.put_in_hands(A)
+		user << "<span class='notice'>You remove a round from \the [src]!</span>"
+		update_icon()
+
 /obj/item/ammo_box/update_icon()
 	switch(multiple_sprites)
 		if(1)
 			icon_state = "[initial(icon_state)]-[stored_ammo.len]"
 		if(2)
 			icon_state = "[initial(icon_state)]-[stored_ammo.len ? "[max_ammo]" : "0"]"
-	desc = "There are [stored_ammo.len] shell\s left!"
+	desc = "[initial(desc)] There are [stored_ammo.len] shell\s left!"
 
 //Behavior for magazines
 /obj/item/ammo_box/magazine/proc/ammo_count()

code/modules/projectiles/ammunition/ammo_casings.dm

@@ -1,169 +1,165 @@
-/obj/item/ammo_casing/a357
-	desc = "A .357 bullet casing."
-	caliber = "357"
-	projectile_type = "/obj/item/projectile/bullet"
-
-/obj/item/ammo_casing/a50
-	desc = "A .50AE bullet casing."
-	caliber = ".50"
-	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"
-
-
-/obj/item/ammo_casing/a75
-	desc = "A .75 bullet casing."
-	caliber = "75"
-	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"
-
-
-/obj/item/ammo_casing/c38
-	desc = "A .38 bullet casing."
-	caliber = "38"
-	projectile_type = "/obj/item/projectile/bullet/c38"
-
-
-/obj/item/ammo_casing/c9mm
-	desc = "A 9mm bullet casing."
-	caliber = "9mm"
-	projectile_type = "/obj/item/projectile/bullet/midbullet9"
-
-
-/obj/item/ammo_casing/c45
-	desc = "A .45 bullet casing."
-	caliber = ".45"
-	projectile_type = "/obj/item/projectile/bullet/midbullet45"
-
-/obj/item/ammo_casing/c10mm
-	desc = "A 10mm bullet casing."
-	caliber = "10mm"
-	projectile_type = "/obj/item/projectile/bullet/midbullet10"
-
-/obj/item/ammo_casing/a12mm
-	desc = "A 12mm bullet casing."
-	caliber = "12mm"
-	projectile_type = "/obj/item/projectile/bullet/midbullet12"
-
-
-/obj/item/ammo_casing/shotgun
-	name = "shotgun shell"
-	desc = "A 12 gauge shell."
-	icon_state = "slshell"
-	caliber = "shotgun"
-	projectile_type = "/obj/item/projectile/bullet/slug"
-	m_amt = 4000
-
-/obj/item/ammo_casing/shotgun/buck
-	name = "buckshot shell"
-	desc = "A 12 gauge buckshot shell."
-	icon_state = "gshell"
-	projectile_type = "/obj/item/projectile/bullet/buck"
-	buck = 5
-	deviation = 0.8
-
-/obj/item/ammo_casing/shotgun/birdshot
-	name = "birdshot shell"
-	desc = "A shotgun shell full of birdshot."
-	icon_state = "blshell"
-	projectile_type = "/obj/item/projectile/bullet/rubberbullet"
-	buck = 4
-	deviation = 1
-	m_amt = 6000
-
-
-/obj/item/ammo_casing/shotgun/beanbag
-	name = "beanbag shell"
-	desc = "A weak beanbag shell."
-	icon_state = "bshell"
-	projectile_type = "/obj/item/projectile/bullet/rubberbullet"
-	m_amt = 250
-
-/obj/item/ammo_casing/shotgun/fakebeanbag
-	name = "beanbag shell"
-	desc = "A weak beanbag shell."
-	icon_state = "bshell"
-	projectile_type = "/obj/item/projectile/bullet/weakbullet/booze"
-
-/obj/item/ammo_casing/shotgun/stunshell
-	name = "stun shell"
-	desc = "A stunning shell."
-	icon_state = "stunshell"
-	projectile_type = "/obj/item/projectile/bullet/stunslug"
-	m_amt = 250
-
-/obj/item/ammo_casing/shotgun/incendiary
-	name = "incendiary shell"
-	desc = "An incendiary shell"
-	icon_state = "ishell"
-	projectile_type = "/obj/item/projectile/bullet/incendiary/shell"
-
-/obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
-	name = "dragonsbreath shell"
-	desc = "A shotgun shell which fires a spread of incendiary pellets."
-	icon_state = "ishell2"
-	projectile_type = "/obj/item/projectile/bullet/incendiary/shell/dragonsbreath"
-	buck = 4
-	deviation = 0.9
-
-/obj/item/ammo_casing/shotgun/techshell
-	name = "unloaded technological shell"
-	desc = "A high-tech shotgun shell which can be loaded with materials to produce unique effects."
-	icon_state = "tshell"
-	projectile_type = null
-
-/obj/item/ammo_casing/shotgun/meteorshot
-	name = "meteorshot shell"
-	desc = "A shotgun shell rigged with CMC technology, which launches a massive slug when fired."
-	icon_state = "mshell"
-	projectile_type = "/obj/item/projectile/bullet/meteorshot"
-
-/obj/item/ammo_casing/shotgun/pulseslug
-	name = "pulse slug"
-	desc = "A delicate device which can be loaded into a shotgun. The primer acts as a button which triggers the gain medium and fires a powerful \
-	energy blast. While the heat and power drain limit it to one use, it can still allow an operator to engage targets that ballistic ammunition \
-	would have difficulty with."
-	icon_state = "pshell"
-	projectile_type = "/obj/item/projectile/beam/pulse/shot"
-
-/obj/item/ammo_casing/shotgun/dart
-	name = "shotgun dart"
-	desc = "A dart for use in shotguns. Can be injected with up to 30 units of any chemical."
-	icon_state = "cshell"
-	projectile_type = /obj/item/projectile/bullet/dart
-	m_amt = 12500
-
-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/a762"
-
-/obj/item/ammo_casing/rocket
-	name = "rocket shell"
-	desc = "A high explosive designed to be fired from a launcher."
-	icon_state = "rocketshell"
-	projectile_type = "/obj/item/missile"
-	caliber = "rocket"
-
-/obj/item/ammo_casing/energy/kinetic
-	projectile_type = /obj/item/projectile/bullet
-	//select_name = "kinetic"
-	//e_cost = 500
-	//fire_sound = 'sound/weapons/Gunshot4.ogg'
+/obj/item/ammo_casing/a357
+	desc = "A .357 bullet casing."
+	caliber = "357"
+	projectile_type = "/obj/item/projectile/bullet"
+
+/obj/item/ammo_casing/a50
+	desc = "A .50AE bullet casing."
+	caliber = ".50"
+	projectile_type = "/obj/item/projectile/bullet"
+
+/obj/item/ammo_casing/c38
+	desc = "A .38 bullet casing."
+	caliber = "38"
+	projectile_type = "/obj/item/projectile/bullet/weakbullet2/rubber"
+
+
+/obj/item/ammo_casing/c10mm
+	desc = "A 10mm bullet casing."
+	caliber = "10mm"
+	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/weakbullet3"
+
+
+/obj/item/ammo_casing/c45
+	desc = "A .45 bullet casing."
+	caliber = ".45"
+	projectile_type = "/obj/item/projectile/bullet/midbullet"
+
+
+/obj/item/ammo_casing/shotgun
+	name = "shotgun slug"
+	desc = "A 12 gauge lead slug."
+	icon_state = "blshell"
+	caliber = "shotgun"
+	projectile_type = "/obj/item/projectile/bullet"
+	m_amt = 4000
+
+
+/obj/item/ammo_casing/shotgun/buckshot
+	name = "buckshot shell"
+	desc = "A 12 gauge buckshot shell."
+	icon_state = "gshell"
+	projectile_type = "/obj/item/projectile/bullet/pellet"
+	buck = 5
+	deviation = 0.8
+
+
+/obj/item/ammo_casing/shotgun/beanbag
+	name = "beanbag slug"
+	desc = "A weak beanbag slug for riot control."
+	icon_state = "bshell"
+	projectile_type = "/obj/item/projectile/bullet/weakbullet/rubber"
+	m_amt = 250
+
+
+/obj/item/ammo_casing/shotgun/improvised
+	name = "improvised shell"
+	desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards."
+	icon_state = "gshell"
+	projectile_type = "/obj/item/projectile/bullet/pellet/weak"
+	m_amt = 250
+	buck = 5
+	deviation = 0.8
+
+
+/obj/item/ammo_casing/shotgun/stunslug
+	name = "taser slug"
+	desc = "A stunning taser slug."
+	icon_state = "stunshell"
+	projectile_type = "/obj/item/projectile/bullet/stunshot"
+	m_amt = 200
+
+
+/obj/item/ammo_casing/shotgun/meteorshot
+	name = "meteorshot shell"
+	desc = "A shotgun shell rigged with CMC technology, which launches a massive slug when fired."
+	icon_state = "mshell"
+	projectile_type = "/obj/item/projectile/bullet/meteorshot"
+
+/obj/item/ammo_casing/shotgun/pulseslug
+	name = "pulse slug"
+	desc = "A delicate device which can be loaded into a shotgun. The primer acts as a button which triggers the gain medium and fires a powerful \
+	energy blast. While the heat and power drain limit it to one use, it can still allow an operator to engage targets that ballistic ammunition \
+	would have difficulty with."
+	icon_state = "pshell"
+	projectile_type = "/obj/item/projectile/beam/pulse/shot"
+
+/obj/item/ammo_casing/shotgun/incendiary
+	name = "incendiary slug"
+	desc = "An incendiary-coated shotgun slug."
+	icon_state = "ishell"
+	projectile_type = "/obj/item/projectile/bullet/incendiary/shell"
+
+/obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
+	name = "dragonsbreath shell"
+	desc = "A shotgun shell which fires a spread of incendiary pellets."
+	icon_state = "ishell2"
+	projectile_type = "/obj/item/projectile/bullet/incendiary/shell/dragonsbreath"
+	buck = 4
+	deviation = 0.9
+
+/obj/item/ammo_casing/shotgun/techshell
+	name = "unloaded technological shell"
+	desc = "A high-tech shotgun shell which can be loaded with materials to produce unique effects."
+	icon_state = "cshell"
+	projectile_type = null
+/*
+/obj/item/ammo_casing/shotgun/dart
+	name = "shotgun dart"
+	desc = "A dart for use in shotguns. Can be injected with up to 30 units of any chemical."
+	icon_state = "cshell"
+	projectile_type = /obj/item/projectile/bullet/dart
+
+/obj/item/ammo_casing/shotgun/dart/New()
+	..()
+	flags |= NOREACT
+	flags |= OPENCONTAINER
+	create_reagents(30)
+
+/obj/item/ammo_casing/shotgun/dart/attackby()
+	return
+*/
+
+/obj/item/ammo_casing/shotgun/fakebeanbag
+	name = "beanbag shell"
+	desc = "A weak beanbag shell."
+	icon_state = "bshell"
+	projectile_type = "/obj/item/projectile/bullet/weakbullet/booze"
+
+/obj/item/ammo_casing/a762
+	desc = "A 7.62mm bullet casing."
+	caliber = "a762"
+	projectile_type = "/obj/item/projectile/bullet"
+
+/obj/item/ammo_casing/a545
+	desc = "A 5.45mm bullet casing."
+	caliber = "a545"
+	projectile_type = "/obj/item/projectile/bullet/heavybullet"
+
+/obj/item/ammo_casing/rocket
+	name = "rocket shell"
+	desc = "A high explosive designed to be fired from a launcher."
+	icon_state = "rocketshell"
+	projectile_type = "/obj/item/missile"
+	caliber = "rocket"
+
+/obj/item/ammo_casing/caseless
+	desc = "A caseless bullet casing."
+
+/obj/item/ammo_casing/caseless/a75
+	desc = "A .75 bullet casing."
+	caliber = "75"
+	projectile_type = "/obj/item/projectile/bullet/gyro"
+
+/obj/item/ammo_casing/a40mm
+	name = "40mm HE shell"
+	desc = "A cased high explosive grenade that can only be activated once fired out of a grenade launcher."
+	caliber = "40mm"
+	icon_state = "40mmHE"
+	projectile_type = "/obj/item/projectile/bullet/a40mm"

code/modules/projectiles/ammunition/boxes.dm

@@ -1,63 +1,48 @@
 /obj/item/ammo_box/a357
-	name = "ammo box (.357)"
-	desc = "A box of .357 ammo"
+	name = "speed loader (.357)"
 	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_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_box/c9mm
+	name = "ammo box (9mm)"
+	icon_state = "9mmbox"
+	origin_tech = "combat=2"
+	ammo_type = /obj/item/ammo_casing/c9mm
+	max_ammo = 30
 
+/obj/item/ammo_box/c10mm
+	name = "ammo box (10mm)"
+	icon_state = "10mmbox"
+	origin_tech = "combat=2"
+	ammo_type = /obj/item/ammo_casing/c10mm
+	max_ammo = 20
 
-/obj/item/ammo_box/a418
-	name = "ammo box (.418)"
-	icon_state = "418"
-	ammo_type = "/obj/item/ammo_casing/a418"
-	max_ammo = 7
-	multiple_sprites = 1
+/obj/item/ammo_box/c45
+	name = "ammo box (.45)"
+	icon_state = "45box"
+	origin_tech = "combat=2"
+	ammo_type = /obj/item/ammo_casing/c45
+	max_ammo = 20
 
-
-
-/obj/item/ammo_box/a666
-	name = "ammo box (.666)"
-	icon_state = "666"
-	ammo_type = "/obj/item/ammo_casing/a666"
+/obj/item/ammo_box/a40mm
+	name = "ammo box (40mm grenades)"
+	icon_state = "40mm"
+	ammo_type = /obj/item/ammo_casing/a40mm
 	max_ammo = 4
 	multiple_sprites = 1
 
-
-/obj/item/ammo_box/c9mm
-	name = "Ammunition Box (9mm)"
-	icon_state = "9mm"
-	origin_tech = "combat=2"
-	ammo_type = "/obj/item/ammo_casing/c9mm"
-	max_ammo = 36
-
-/obj/item/ammo_box/c45
-	name = "Ammunition Box (.45)"
-	icon_state = "9mm"
-	origin_tech = "combat=2"
-	ammo_type = "/obj/item/ammo_casing/c45"
-	max_ammo = 32
-
-
-
-/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 = 40
-
 /obj/item/ammo_box/shotgun
 	name = "Ammunition Box (slug)"
-	icon_state = "9mm"
+	icon_state = "9mmbox"
 	origin_tech = "combat=2"
 	ammo_type = /obj/item/ammo_casing/shotgun
 	max_ammo = 8
@@ -65,11 +50,11 @@
 
 /obj/item/ammo_box/shotgun/buck
 	name = "Ammunition Box (buckshot)"
-	ammo_type = /obj/item/ammo_casing/shotgun/buck
+	ammo_type = /obj/item/ammo_casing/shotgun/buckshot
 
 /obj/item/ammo_box/shotgun/stun
 	name = "Ammunition Box (stun shells)"
-	ammo_type = /obj/item/ammo_casing/shotgun/stunshell
+	ammo_type = /obj/item/ammo_casing/shotgun/stunslug
 	m_amt = 20000
 
 /obj/item/ammo_box/shotgun/beanbag

code/modules/projectiles/ammunition/magazines.dm

@@ -25,6 +25,7 @@
 	caliber = "357"
 	max_ammo = 6
 	multiload = 0
+
 /obj/item/ammo_box/magazine/internal/cylinder/rus357/New()
 	stored_ammo += new ammo_type(src)
 
@@ -42,13 +43,15 @@
 	caliber = "shotgun"
 	max_ammo = 4
 	multiload = 0
+
 /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/buck"
+	ammo_type = "/obj/item/ammo_casing/shotgun/buckshot"
 	caliber = "shotgun"
 	max_ammo = 8
 	multiload = 0
+
 /obj/item/ammo_box/magazine/internal/cylinder/dualshot
 	name = "double-barrel shotgun internal magazine"
 	desc = "This doesn't even exist"
@@ -57,6 +60,14 @@
 	max_ammo = 2
 	multiload = 0
 
+/obj/item/ammo_box/magazine/internal/cylinder/improvised
+	name = "improvised shotgun internal magazine"
+	desc = "This doesn't even exist"
+	ammo_type = "/obj/item/ammo_casing/shotgun/improvised"
+	caliber = "shotgun"
+	max_ammo = 1
+	multiload = 0
+
 /obj/item/ammo_box/magazine/internal/shotriot
 	name = "riot shotgun internal magazine"
 	desc = "Oh god, this shouldn't be here"
@@ -64,29 +75,21 @@
 	caliber = "shotgun"
 	max_ammo = 6
 	multiload = 0
+
+/obj/item/ammo_box/magazine/internal/cylinder/grenadelauncher
+	name = "grenade launcher internal magazine"
+	ammo_type = "/obj/item/ammo_casing/a40mm"
+	caliber = "40mm"
+	max_ammo = 1
+
+/obj/item/ammo_box/magazine/internal/cylinder/grenadelauncher/multi
+	ammo_type = "/obj/item/ammo_casing/a40mm"
+	max_ammo = 6
+
 ///////////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)"
+	name = "pistol magazine (10mm)"
 	icon_state = "9x19p"
 	origin_tech = "combat=2"
 	ammo_type = "/obj/item/ammo_casing/c10mm"
@@ -94,39 +97,49 @@
 	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/m45
-	name = "magazine (.45)"
+	name = "handgun magazine (.45)"
 	icon_state = "45"
 	ammo_type = "/obj/item/ammo_casing/c45"
 	caliber = ".45"
 	max_ammo = 8
-	multiple_sprites = 1
 
-/obj/item/ammo_box/magazine/uzim45
-	name = "Uzi magazine (.45)"
-	icon_state = "uzi45"
+/obj/item/ammo_box/magazine/m45/update_icon()
+	..()
+	icon_state = "[initial(icon_state)]-[ammo_count() ? "8" : "0"]"
+
+/obj/item/ammo_box/magazine/smgm9mm
+	name = "SMG magazine (9mm)"
+	icon_state = "smg9mm"
+	ammo_type = "/obj/item/ammo_casing/c9mm"
+	caliber = "9mm"
+	max_ammo = 20
+
+/obj/item/ammo_box/magazine/smgm9mm/update_icon()
+	..()
+	icon_state = "[initial(icon_state)]-[round(ammo_count(),5)]"
+
+/obj/item/ammo_box/magazine/smgm45
+	name = "SMG magazine (.45)"
+	icon_state = "c20r45"
+	origin_tech = "combat=2"
 	ammo_type = "/obj/item/ammo_casing/c45"
 	caliber = ".45"
-	max_ammo = 16
+	max_ammo = 20
 
-/obj/item/ammo_box/magazine/uzim45/update_icon()
+/obj/item/ammo_box/magazine/smgm/update_icon()
 	..()
 	icon_state = "[initial(icon_state)]-[round(ammo_count(),2)]"
 
+/obj/item/ammo_box/magazine/tommygunm45
+	name = "drum magazine (.45)"
+	icon_state = "drum45"
+	ammo_type = "/obj/item/ammo_casing/c45"
+	caliber = ".45"
+	max_ammo = 50
+
 /obj/item/ammo_box/magazine/m50
-	name = "magazine (.50ae)"
+	name = "handgun magazine (.50ae)"
 	icon_state = "50ae"
 	origin_tech = "combat=2"
 	ammo_type = "/obj/item/ammo_casing/a50"
@@ -135,15 +148,27 @@
 	multiple_sprites = 1
 
 /obj/item/ammo_box/magazine/m75
-	name = "magazine (.75)"
+	name = "specialized magazine (.75)"
 	icon_state = "75"
-	ammo_type = "/obj/item/ammo_casing/a75"
+	ammo_type = "/obj/item/ammo_casing/caseless/a75"
 	caliber = "75"
 	multiple_sprites = 2
 	max_ammo = 8
 
+/obj/item/ammo_box/magazine/m545
+	name = "box magazine (5.45mm)"
+	icon_state = "5.45m"
+	origin_tech = "combat=5;syndicate=1"
+	ammo_type = "/obj/item/ammo_casing/a545"
+	caliber = "a545"
+	max_ammo = 30
+
+/obj/item/ammo_box/magazine/m545/update_icon()
+	..()
+	icon_state = "[initial(icon_state)]-[round(ammo_count(),10)]"
+
 /obj/item/ammo_box/magazine/m762
-	name = "magazine (7.62mm)"
+	name = "box magazine (7.62mm)"
 	icon_state = "a762"
 	origin_tech = "combat=2"
 	ammo_type = "/obj/item/ammo_casing/a762"
@@ -154,13 +179,11 @@
 	..()
 	icon_state = "[initial(icon_state)]-[round(ammo_count(),10)]"
 
-//TG Bulldog Automatic Shotty
-
 /obj/item/ammo_box/magazine/m12g
 	name = "shotgun magazine (12g taser slugs)"
 	icon_state = "m12gs"
 	origin_tech = "combat=3;syndicate=1"
-	ammo_type = "/obj/item/ammo_casing/shotgun/stunshell"
+	ammo_type = "/obj/item/ammo_casing/shotgun/stunslug"
 	caliber = "shotgun"
 	max_ammo = 8
 
@@ -172,7 +195,7 @@
 /obj/item/ammo_box/magazine/m12g/buckshot
 	name = "shotgun magazine (12g buckshot)"
 	icon_state = "m12gb"
-	ammo_type = "/obj/item/ammo_casing/shotgun/buck"
+	ammo_type = "/obj/item/ammo_casing/shotgun/buckshot"
 
 
 /obj/item/ammo_box/magazine/m12g/dragon

code/modules/projectiles/gun.dm

@@ -20,6 +20,7 @@
 	var/silenced = 0
 	var/ghettomodded = 0
 	var/recoil = 0
+	var/can_suppress = 0
 	var/clumsy_check = 1
 	var/sawn_desc = null
 	var/obj/item/ammo_casing/chambered = null // The round (not bullet) that is in the chamber. THIS MISPLACED ITEM BROUGHT TO YOU BY HACKY BUCKSHOT.

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

@@ -75,6 +75,11 @@ obj/item/weapon/gun/energy/laser/retro
 	name = "laser cannon"
 	desc = "With the L.A.S.E.R. cannon, the lasing medium is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core. This incredible technology may help YOU achieve high excitation rates with small laser volumes!"
 	icon_state = "lasercannon"
+	item_state = "laser"
+	w_class = 4.0
+	force = 10
+	flags =  FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BACK
 	fire_sound = 'sound/weapons/lasercannonfire.ogg'
 	origin_tech = "combat=4;materials=3;powerstorage=3"
 	projectile_type = "/obj/item/projectile/beam/heavylaser"

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

@@ -2,7 +2,7 @@
 	name = "pulse rifle"
 	desc = "A heavy-duty, pulse-based energy weapon, preferred by front-line combat personnel."
 	icon_state = "pulse"
-	item_state = null	//so the human update icon uses the icon_state instead.
+	item_state = "pulse"	//so the human update icon uses the icon_state instead.
 	force = 10
 	fire_sound = 'sound/weapons/pulse.ogg'
 	charge_cost = 200

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

@@ -44,7 +44,7 @@
 
 /obj/item/weapon/gun/energy/stunrevolver
 	name = "stun revolver"
-	desc = "A high-tech revolver that fires stun cartridges. The stun cartridges can be recharged using a conventional energy weapon recharger."
+	desc = "A high-tech revolver that fires internal, reusable stun cartidges in a revolving cylinder."
 	icon_state = "stunrevolver"
 	fire_sound = "sound/weapons/gunshot.ogg"
 	origin_tech = "combat=3;materials=3;powerstorage=2"

code/modules/projectiles/guns/projectile.dm

@@ -53,6 +53,7 @@
 
 
 /obj/item/weapon/gun/projectile/attackby(var/obj/item/A as obj, mob/user as mob)
+	..()
 	if (istype(A, /obj/item/ammo_box/magazine))
 		var/obj/item/ammo_box/magazine/AM = A
 		if (!magazine && istype(AM, text2path(mag_type)))
@@ -66,10 +67,49 @@
 			return 1
 		else if (magazine)
 			user << "<span class='notice'>There's already a magazine in \the [src].</span>"
+	if(istype(A, /obj/item/weapon/suppressor))
+		var/obj/item/weapon/suppressor/S = A
+		if(can_suppress)
+			if(!silenced)
+				if(user.l_hand != src && user.r_hand != src)
+					user << "<span class='notice'>You'll need [src] in your hands to do that.</span>"
+					return
+				user.drop_item()
+				user << "<span class='notice'>You screw [S] onto [src].</span>"
+				silenced = A
+				S.oldsound = fire_sound
+				S.initial_w_class = w_class
+				fire_sound = 'sound/weapons/Gunshot_silenced.ogg'
+				w_class = 3 //so pistols do not fit in pockets when suppressed
+				A.loc = src
+				update_icon()
+				return
+			else
+				user << "<span class='warning'>[src] already has a suppressor.</span>"
+				return
+		else
+			user << "<span class='warning'>You can't seem to figure out how to fit [S] on [src].</span>"
+			return
 	return 0
 
+/obj/item/weapon/gun/projectile/attack_hand(mob/user as mob)
+	if(loc == user)
+		if(silenced)
+			var/obj/item/weapon/suppressor/S = silenced
+			if(user.l_hand != src && user.r_hand != src)
+				..()
+				return
+			user << "<span class='notice'>You unscrew [silenced] from [src].</span>"
+			user.put_in_hands(silenced)
+			fire_sound = S.oldsound
+			w_class = S.initial_w_class
+			silenced = 0
+			update_icon()
+			return
+	..()
+
 /obj/item/weapon/gun/projectile/attack_self(mob/living/user as mob)
-	if (magazine)
+	if(magazine)
 		magazine.loc = get_turf(src.loc)
 		user.put_in_hands(magazine)
 		magazine.update_icon()
@@ -92,3 +132,12 @@
 	if (magazine)
 		boolets += magazine.ammo_count()
 	return boolets
+
+/obj/item/weapon/suppressor
+	name = "suppressor"
+	desc = "A universal syndicate small-arms suppressor for maximum espionage."
+	icon = 'icons/obj/gun.dmi'
+	icon_state = "suppressor"
+	w_class = 2
+	var/oldsound = null
+	var/initial_w_class = null

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

@@ -1,75 +1,71 @@
 /obj/item/weapon/gun/projectile/automatic //Hopefully someone will find a way to make these fire in bursts or something. --Superxpdude
-	name = "submachine gun"
-	desc = "A lightweight, fast firing gun. Uses 9mm rounds."
-	icon_state = "saber"	//ugly
+	name = "prototype SMG"
+	desc = "A lightweight, prototype 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors."
+	icon_state = "saber"
 	w_class = 3.0
 	origin_tech = "combat=4;materials=2"
 	automatic = 1
-	mag_type = "/obj/item/ammo_box/magazine/msmg9mm"
+	mag_type = "/obj/item/ammo_box/magazine/smgm9mm"
 	var/alarmed = 0
+	can_suppress = 1
 	fire_delay = 0
 	isHandgun()
 		return 0
 
 /obj/item/weapon/gun/projectile/automatic/update_icon()
 	..()
-	icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"]"
+	icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"][silenced ? "-suppressed" : ""]"
 	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
-	name = "Uzi"
-	desc = "A lightweight, fast firing gun, for when you want someone dead. Uses .45 rounds."
-	icon_state = "mini-uzi"
-	w_class = 3.0
-
-	origin_tech = "combat=5;materials=2;syndicate=8"
-	mag_type = "/obj/item/ammo_box/magazine/uzim45"
-
-	isHandgun()
-		return 1
-
+/obj/item/weapon/gun/projectile/automatic/proc/empty_alarm()
+	if(!chambered && !get_ammo() && !alarmed)
+		playsound(src.loc, 'sound/weapons/smg_empty_alarm.ogg', 40, 1)
+		update_icon()
+		alarmed = 1
+	return
 
 /obj/item/weapon/gun/projectile/automatic/c20r
-	name = "\improper C-20r SMG"
-	desc = "A lightweight, compact bullpup SMG. Uses .45 rounds in medium-capacity magazines and has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp."
+	name = "syndicate SMG"
+	desc = "A lightweight, bullpup .45 SMG, designated 'C-20r'. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp."
 	icon_state = "c20r"
 	item_state = "c20r"
-	w_class = 3.0
 	origin_tech = "combat=5;materials=2;syndicate=8"
-	mag_type = "/obj/item/ammo_box/magazine/m12mm"
+	mag_type = "/obj/item/ammo_box/magazine/smgm45"
 	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
 
+/obj/item/weapon/gun/projectile/automatic/c20r/New()
+	..()
+	update_icon()
+	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)
-		alarmed = 1
+	empty_alarm()
 	return
 
 /obj/item/weapon/gun/projectile/automatic/c20r/update_icon()
 	..()
-	icon_state = "c20r[magazine ? "-[round(get_ammo(0),4)]" : ""][chambered ? "" : "-e"]"
+	icon_state = "c20r[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""][chambered ? "" : "-e"][silenced ? "-suppressed" : ""]"
 	return
 
 
 /obj/item/weapon/gun/projectile/automatic/l6_saw
-	name = "\improper L6 SAW"
-	desc = "A heavily modified light machine gun with a tactical plasteel frame resting on a rather traditionally-made belt-fed ballistic weapon. Has 'Aussec Armoury - 2531' engraved on the reciever."
+	name = "syndicate LMG"
+	desc = "A heavily modified 7.62 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the reciever below the designation."
 	icon_state = "l6closed100"
 	item_state = "l6closedmag"
-	w_class = 4
+	w_class = 5
 	slot_flags = 0
 	origin_tech = "combat=5;materials=1;syndicate=2"
 	mag_type = "/obj/item/ammo_box/magazine/m762"
 	fire_sound = 'sound/weapons/Gunshot3.ogg'
 
 	var/cover_open = 0
+	can_suppress = 0
 
 
 
@@ -115,8 +111,8 @@
 
 
 /obj/item/weapon/gun/projectile/automatic/bulldog
-	name = "\improper Bulldog shotgun"
-	desc = "A compact, mag-fed semi-automatic shotgun for combat in narrow corridors. Compatible only with specialized magazines."
+	name = "syndicate shotgun"
+	desc = "A compact, mag-fed semi-automatic shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines."
 	icon_state = "bulldog"
 	item_state = "bulldog"
 	icon_override = 'icons/mob/in-hand/guns.dmi'
@@ -124,6 +120,7 @@
 	origin_tech = "combat=5;materials=4;syndicate=6"
 	mag_type = "/obj/item/ammo_box/magazine/m12g"
 	fire_sound = 'sound/weapons/Gunshot4.ogg'
+	can_suppress = 0
 
 /obj/item/weapon/gun/projectile/automatic/bulldog/New()
 	..()
@@ -144,16 +141,87 @@
 
 /obj/item/weapon/gun/projectile/automatic/bulldog/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
+	empty_alarm()
 	return
 
 
-/* The thing I found with guns in ss13 is that they don't seem to simulate the rounds in the magazine in the gun.
-   Afaik, since projectile.dm features a revolver, this would make sense since the magazine is part of the gun.
-   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 */
+/obj/item/weapon/gun/projectile/automatic/c90gl
+	name = "syndicate assault rifle"
+	desc = "A bullpup and compact 5.45x39 assault rifle with a unique toploading design, designated 'C-90gl'. Has an attached underbarrel grenade launcher which can be toggled on and off."
+	icon_state = "c90gl"
+	item_state = "c90gl"
+	icon_override = 'icons/mob/in-hand/guns.dmi'
+	origin_tech = "combat=5;materials=2;syndicate=8"
+	mag_type = "/obj/item/ammo_box/magazine/m545"
+	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+	action_button_name = "Toggle Grenade Launcher"
+	icon_action_button = "Action_c90gl"
+	can_suppress = 0
+	var/select = 1 //1 for boolets, 0 for explosions.
+	var/obj/item/weapon/gun/projectile/revolver/grenadelauncher/underbarrel
+
+/obj/item/weapon/gun/projectile/automatic/c90gl/New()
+	..()
+	underbarrel = new /obj/item/weapon/gun/projectile/revolver/grenadelauncher(src)
+	update_icon()
+	return
+
+/obj/item/weapon/gun/projectile/automatic/c90gl/afterattack(var/atom/target, var/mob/living/user, flag, params)
+	if(select)
+		..()
+		empty_alarm()
+		return
+	else
+		underbarrel.afterattack(target, user, flag, params)
+
+/obj/item/weapon/gun/projectile/automatic/c90gl/attackby(var/obj/item/A, mob/user)
+	if(select)
+		..()
+	else
+		underbarrel.attackby(A, user)
+
+/obj/item/weapon/gun/projectile/automatic/c90gl/attack_self(var/mob/living/user)
+	if(select)
+		..()
+	else
+		underbarrel.attack_self(user)
+
+
+
+/obj/item/weapon/gun/projectile/automatic/c90gl/update_icon()
+	..()
+	overlays.Cut()
+	if(select)
+		overlays += "c90prim"
+	else
+		overlays += "c90gren"
+	icon_state = "c90gl[magazine ? "-[Ceiling(get_ammo(0)/6)*6]" : ""][chambered ? "" : "-e"]"
+	return
+
+/obj/item/weapon/gun/projectile/automatic/c90gl/proc/underbarrel_swap()
+	var/mob/living/carbon/human/user = usr
+	if(select)
+		select = 0
+		user << "<span class='notice'>You switch to grenades.</span>"
+	else
+		select = 1
+		user << "<span class='notice'>You switch to bullets.</span>"
+
+	update_icon()
+	return
+
+/obj/item/weapon/gun/projectile/automatic/c90gl/ui_action_click()
+	underbarrel_swap()
+
+
+
+/obj/item/weapon/gun/projectile/automatic/tommygun
+	name = "tommy gun"
+	desc = "A genuine 'Chicago Typewriter'."
+	icon_state = "tommygun"
+	item_state = "tommygun"
+	slot_flags = 0
+	origin_tech = "combat=5;materials=1;syndicate=2"
+	mag_type = "/obj/item/ammo_box/magazine/tommygunm45"
+	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+	can_suppress = 0

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

@@ -0,0 +1,50 @@
+//KEEP IN MIND: These are different from gun/grenadelauncher. These are designed to shoot premade rocket and grenade projectiles, not flashbangs or chemistry casings etc.
+//Put handheld rocket launchers here if someone ever decides to make something so hilarious ~Paprika
+
+
+/obj/item/weapon/gun/projectile/automatic/gyropistol
+	name = "gyrojet pistol"
+	desc = "A prototype pistol designed to fire self propelled rockets."
+	icon_state = "gyropistol"
+	fire_sound = 'sound/effects/Explosion1.ogg'
+	origin_tech = "combat=3"
+	mag_type = "/obj/item/ammo_box/magazine/m75"
+
+/obj/item/weapon/gun/projectile/automatic/gyropistol/New()
+	..()
+	update_icon()
+	return
+
+/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/revolver/grenadelauncher//this is only used for underbarrel grenade launchers at the moment, but admins can still spawn it if they feel like being assholes
+	desc = "A break-operated grenade launcher."
+	name = "grenade launcher"
+	icon_state = "dshotgun-sawn"
+	item_state = "gun"
+	mag_type = "/obj/item/ammo_box/magazine/internal/cylinder/grenadelauncher"
+	w_class = 3
+
+/obj/item/weapon/gun/projectile/revolver/grenadelauncher/attackby(var/obj/item/A, mob/user)
+	..()
+	if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing))
+		chamber_round()
+
+/obj/item/weapon/gun/projectile/revolver/grenadelauncher/multi
+	desc = "A revolving 6-shot grenade launcher."
+	name = "multi grenade launcher"
+	icon_state = "bulldog"
+	item_state = "bulldog"
+	icon_override = 'icons/mob/in-hand/guns.dmi'
+	mag_type = "/obj/item/ammo_box/magazine/internal/cylinder/grenadelauncher/multi"

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

@@ -1,3 +1,17 @@
+/obj/item/weapon/gun/projectile/automatic/pistol
+	name = "syndicate pistol"
+	desc = "A small, easily concealable 10mm handgun. Has a threaded barrel for suppressors."
+	icon_state = "pistol"
+	w_class = 2
+	origin_tech = "combat=2;materials=2;syndicate=2"
+	mag_type = "/obj/item/ammo_box/magazine/m10mm"
+	can_suppress = 1
+
+/obj/item/weapon/gun/projectile/automatic/pistol/update_icon()
+	..()
+	icon_state = "[initial(icon_state)][chambered ? "" : "-e"][silenced ? "-suppressed" : ""]"
+	return
+
 /obj/item/weapon/gun/projectile/automatic/m2411
 	name = "M2411"
 	desc = "John Browning's classic updated for the modern day. Uses .45 rounds."
@@ -12,29 +26,19 @@
 	icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
 	return
 
-
-
 /obj/item/weapon/gun/projectile/automatic/deagle
 	name = "desert eagle"
-	desc = "A robust handgun that uses .50 AE ammo"
+	desc = "A robust .50 AE handgun."
 	icon_state = "deagle"
 	force = 14.0
 	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()
-		alarmed = 1
-	return
-
 /obj/item/weapon/gun/projectile/automatic/deagle/update_icon()
 	..()
 	icon_state = "[initial(icon_state)][magazine ? "" : "-e"]"
 
 /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."
+	desc = "A gold plated desert eagle folded over a million times by superior martian gunsmiths. Uses .50 AE ammo."
 	icon_state = "deagleg"
 	item_state = "deagleg"
 
@@ -43,89 +47,4 @@
 /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/automatic/gyropistol
-	name = "gyrojet pistol"
-	desc = "A bulky pistol designed to fire self propelled rounds"
-	icon_state = "gyropistol"
-	fire_sound = 'sound/effects/Explosion1.ogg'
-	origin_tech = "combat=3"
-	mag_type = "/obj/item/ammo_box/magazine/m75"
-
-/obj/item/weapon/gun/projectile/automatic/gyropistol/New()
-	..()
-	update_icon()
-	return
-
-/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 and has a threaded barrel for suppressors."
-	icon_state = "pistol"
-	w_class = 2
-	silenced = 0
-	origin_tech = "combat=2;materials=2;syndicate=2"
-	mag_type = "/obj/item/ammo_box/magazine/m10mm"
-	fire_sound = 'sound/weapons/Gunshot2.ogg'
-
-/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)
-				..()
-				return
-			user << "<span class='notice'>You unscrew [silenced] from [src].</span>"
-			user.put_in_hands(silenced)
-			var/obj/item/weapon/silencer/S = silenced
-			fire_sound = S.oldsound
-			silenced = 0
-			w_class = 2
-			update_icon()
-			return
-	..()
-
-
-/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>"
-			return
-		user.drop_item()
-		user << "<span class='notice'>You screw [I] onto [src].</span>"
-		silenced = I	//dodgy?
-		var/obj/item/weapon/silencer/S = I
-		S.oldsound = fire_sound
-		fire_sound = 'sound/weapons/Gunshot_silenced.ogg'
-		w_class = 3
-		I.loc = src		//put the silencer into the gun
-		update_icon()
-		return
-	..()
-
-/obj/item/weapon/gun/projectile/automatic/pistol/update_icon()
-	..()
-	icon_state = "[initial(icon_state)][silenced ? "-silencer" : ""][chambered ? "" : "-e"]"
-	return
-
-/obj/item/weapon/silencer
-	name = "supressor"
-	desc = "A universal syndicate small-arms suppressor."
-	icon = 'icons/obj/gun.dmi'
-	icon_state = "silencer"
-	w_class = 2
-	var/oldsound = 0 //Stores the true sound the gun made before it was silenced
+	item_state = "deagleg"

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

@@ -1,5 +1,5 @@
 /obj/item/weapon/gun/projectile/revolver
-	desc = "A classic revolver. Uses 357 ammo"
+	desc = "A suspicious revolver. Uses .357 ammo."
 	name = "revolver"
 	icon_state = "revolver"
 	mag_type = "/obj/item/ammo_box/magazine/internal/cylinder"
@@ -76,7 +76,7 @@
 	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."
+	desc = "A cheap Martian knock-off of a classic law enforcement firearm. Uses .38-special rounds."
 	name = "revolver"
 	icon_state = "detective"
 	origin_tech = "combat=2;materials=2"
@@ -165,8 +165,8 @@
 
 
 /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
+	name = "autorevolver"
+	desc = "A retro high-powered mateba autorevolver typically used by officers of the New Russia military. Uses .357 ammo."	//>10mm hole >.357
 	icon_state = "mateba"
 	origin_tech = "combat=2;materials=2"
 
@@ -175,7 +175,7 @@
 
 /obj/item/weapon/gun/projectile/revolver/russian
 	name = "Russian Revolver"
-	desc = "A Russian made revolver. Uses .357 ammo."
+	desc = "A Russian-made revolver for drinking games. Uses .357 ammo, and has a mechanism that spins the chamber before each trigger pull."
 	origin_tech = "combat=2;materials=2"
 	mag_type = "/obj/item/ammo_box/magazine/internal/cylinder/rus357"
 	var/spun = 0

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

@@ -1,6 +1,6 @@
 /obj/item/weapon/gun/projectile/shotgun
 	name = "shotgun"
-	desc = "Useful for sweeping alleys."
+	desc = "A traditional shotgun with wood furniture and a four-shell capacity underneath."
 	icon_state = "shotgun"
 	item_state = "shotgun"
 	w_class = 4.0
@@ -83,6 +83,7 @@
 
 /obj/item/weapon/gun/projectile/shotgun/combat
 	name = "combat shotgun"
+	desc = "A traditional shotgun with tactical furniture and an eight-shell capacity underneath."
 	icon_state = "cshotgun"
 	origin_tech = "combat=5;materials=2"
 	mag_type = "/obj/item/ammo_box/magazine/internal/shotcom"
@@ -152,3 +153,30 @@
 		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>"
+
+// IMPROVISED SHOTGUN //
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised
+	name = "improvised shotgun"
+	desc = "Essentially a tube that aims shotgun shells."
+	icon_state = "ishotgun"
+	item_state = "shotgun"
+	w_class = 4.0
+	force = 10
+	origin_tech = "combat=2;materials=2"
+	mag_type = "/obj/item/ammo_box/magazine/internal/cylinder/improvised"
+	sawn_desc = "I'm just here for the gasoline."
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/attackby(var/obj/item/A as obj, mob/user as mob)
+	..()
+	if(istype(A, /obj/item/stack/cable_coil))
+		var/obj/item/stack/cable_coil/C = A
+		if(C.use(10))
+			flags =  CONDUCT
+			slot_flags = SLOT_BACK
+			icon_state = "ishotgunsling"
+			user << "<span class='notice'>You tie the lengths of cable to the shotgun, making a sling.</span>"
+			update_icon()
+		else
+			user << "<span class='warning'>You need at least ten lengths of cable if you want to make a sling.</span>"
+			return

code/modules/projectiles/projectile.dm

@@ -166,11 +166,11 @@
 
 
 	process()
-		if(kill_count < 1)
-			del(src)
-			return
-		kill_count--
 		spawn while(src)
+			if(kill_count < 1)
+				del(src)
+				return
+			kill_count--		
 			if((!( current ) || loc == current))
 				current = locate(min(max(x + xo, 1), world.maxx), min(max(y + yo, 1), world.maxy), z)
 			if((x == 1 || x == world.maxx || y == 1 || y == world.maxy))

code/modules/projectiles/projectile/bullets.dm

@@ -8,36 +8,63 @@
 	embed = 1
 	sharp = 1
 
-/*	on_hit(var/atom/target, var/blocked = 0)
-		if (..(target, blocked))
-			var/mob/living/L = target
-			shake_camera(L, 3, 2)
-			return 1
-		return 0 */
-
 /obj/item/projectile/bullet/weakbullet
 	damage = 5
 	stun = 5
 	weaken = 5
 
-/obj/item/projectile/bullet/slug
-	name = "slug"
-
-
-/obj/item/projectile/bullet/rubberbullet  //  Back to insta-stun bullets.
-	damage = 5
-	stun = 5
-	weaken = 5
+/obj/item/projectile/bullet/weakbullet/rubber //beanbag shotgun shells
 	embed = 0
 	sharp = 0
 
-/obj/item/projectile/bullet/c38 //replacement for detective's ammo
+/obj/item/projectile/bullet/weakbullet2
 	damage = 15
 	stun = 5
 	weaken = 5
+
+/obj/item/projectile/bullet/weakbullet2/rubber //detective's c38 bullets
 	embed = 0
 	sharp = 0
 
+/obj/item/projectile/bullet/weakbullet3
+	damage = 20
+
+/obj/item/projectile/bullet/pellet
+	name = "pellet"
+	damage = 15
+
+/obj/item/projectile/bullet/blank
+	name = "blankshot"
+	nodamage = 1
+
+/obj/item/projectile/bullet/pellet/weak
+	damage = 3
+
+/obj/item/projectile/bullet/midbullet
+	damage = 20
+	stun = 5
+	weaken = 5
+
+/obj/item/projectile/bullet/midbullet2
+	damage = 25
+
+/obj/item/projectile/bullet/midbullet3
+	damage = 30
+
+/obj/item/projectile/bullet/heavybullet
+	damage = 35
+
+
+/obj/item/projectile/bullet/stunshot
+	name = "stunshot"
+	damage = 5
+	stun = 5
+	weaken = 5
+	stutter = 5
+	embed = 0
+	sharp = 0
+
+
 /obj/item/projectile/bullet/weakbullet/booze
 	embed = 0
 	on_hit(var/atom/target, var/blocked = 0)
@@ -57,71 +84,6 @@
 				M.drowsyness += 10
 				A.volume += 5 //Because we can
 
-
-/obj/item/projectile/bullet/midbullet12
-	damage = 20
-	stun = 5
-	weaken = 5
-
-/obj/item/projectile/bullet/midbullet9
-	damage = 25
-
-/obj/item/projectile/bullet/midbullet45
-	damage = 25
-	stun = 1
-	weaken = 1
-
-/obj/item/projectile/bullet/midbullet10 //Only used with the Stechkin Pistol - RobRichards
-	damage = 30
-
-/obj/item/projectile/bullet/buck
-	name = "pellet"
-	damage = 15
-
-/obj/item/projectile/bullet/blank
-	name = "blankshot"
-	nodamage = 1
-
-/obj/item/projectile/bullet/suffocationbullet//How does this even work?
-	name = "co bullet"
-	damage = 20
-	damage_type = OXY
-
-
-/obj/item/projectile/bullet/cyanideround
-	name = "poison bullet"
-	damage = 40
-	damage_type = TOX
-
-
-/obj/item/projectile/bullet/burstbullet//I think this one needs something for the on hit
-	name = "exploding bullet"
-	damage = 20
-	embed = 0
-	edge = 1
-
-/obj/item/projectile/bullet/stunshot
-	name = "stunshot"
-	damage = 5
-	stun = 5
-	weaken = 5
-	stutter = 5
-	embed = 0
-	sharp = 0
-
-/obj/item/projectile/bullet/stunslug
-	name = "stunslug"
-	damage = 5
-	stun = 5
-	weaken = 5
-	stutter = 5
-	embed = 0
-	sharp = 0
-
-/obj/item/projectile/bullet/a762
-	damage = 35
-
-
 /obj/item/projectile/bullet/incendiary
 
 /obj/item/projectile/bullet/incendiary/on_hit(var/atom/target, var/blocked = 0)

code/modules/projectiles/projectile/special.dm

@@ -24,6 +24,17 @@
 		explosion(target, -1, 0, 2)
 		return 1
 
+/obj/item/projectile/bullet/a40mm
+	name ="40mm grenade"
+	desc = "USE A WEEL GUN"
+	icon_state= "bolter"
+	damage = 60
+	flag = "bullet"
+
+/obj/item/projectile/bullet/a40mm/on_hit(atom/target, blocked = 0)
+	explosion(target, -1, 0, 2, 1, 0)
+	return 1
+
 /obj/item/projectile/temp
 	name = "freeze beam"
 	icon_state = "ice_2"

code/modules/reagents/Chemistry-Reagents.dm

@@ -2634,12 +2634,12 @@ datum
 				if (istype(holder.my_atom,/mob/living))
 					var/mob/living/M as mob
 					var/to_remove = 0
-					if(!M) M = holder.my_atom
 					if (holder.has_reagent("anti_toxin"))
 						to_remove = min(holder.get_reagent_amount("anti_toxin"),data)
 						holder.remove_reagent("anti_toxin", to_remove, 0)
 						data -= to_remove
-					M.adjustToxLoss((data-1)*rand(2,4))
+					if(M)
+						M.adjustToxLoss((data-1)*rand(2,4))
 				..()
 
 		psilocybin

code/modules/research/designs.dm

@@ -1587,7 +1587,7 @@ datum/design/cyborg_analyzer
 	build_type = PROTOLATHE
 	materials = list("$metal" = 30, "$glass" = 20)
 	reliability_base = 74
-	build_path = "/obj/item/device/robotanalyzer"	
+	build_path = "/obj/item/device/robotanalyzer"
 
 datum/design/mmi
 	name = "Man-Machine Interface"
@@ -1710,7 +1710,7 @@ datum/design/nuclear_gun
 
 datum/design/stunrevolver
 	name = "Stun Revolver"
-	desc = "The prize of the Head of Security."
+	desc = "A high-tech revolver that fires internal, reusable stun cartidges in a revolving cylinder. The stun cartridges can be recharged using a conventional energy weapon recharger."
 	id = "stunrevolver"
 	req_tech = list("combat" = 3, "materials" = 3, "powerstorage" = 2)
 	build_type = PROTOLATHE
@@ -1797,8 +1797,8 @@ datum/design/large_grenade
 	build_path = "/obj/item/weapon/grenade/chem_grenade/large"
 
 datum/design/smg
-	name = "Submachine Gun"
-	desc = "A lightweight, fast firing gun."
+	name = "Prototype Submachine Gun"
+	desc = "A prototype weapon made using lightweight materials on a traditional frame, designed to fire standard 9mm rounds."
 	id = "smg"
 	req_tech = list("combat" = 4, "materials" = 3)
 	build_type = PROTOLATHE
@@ -1806,6 +1806,16 @@ datum/design/smg
 	build_path = "/obj/item/weapon/gun/projectile/automatic"
 	locked = 1
 
+datum/design/mag_smg
+	name = "Submachine Gun Magazine (9mm)"
+	desc = "A 20-round magazine for the prototype submachine gun."
+	id = "mag_smg"
+	req_tech = list("combat" = 4, "materials" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 2000)
+	build_path = /obj/item/ammo_box/magazine/smgm9mm
+
+
 datum/design/ionrifle
 	name = "Ion Rifle"
 	desc = "How to dismantle a cyborg : The gun."
@@ -1816,24 +1826,6 @@ datum/design/ionrifle
 	build_path = /obj/item/weapon/gun/energy/ionrifle
 	locked = 1
 
-datum/design/ammo_9mm
-	name = "Ammunition Box (9mm)"
-	desc = "A box of prototype 9mm ammunition."
-	id = "ammo_9mm"
-	req_tech = list("combat" = 4, "materials" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 2000)
-	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" = 2000)
-	build_path = "/obj/item/ammo_box/magazine/msmg9mm"
-
 datum/design/stunshell
 	name = "Stun Shell"
 	desc = "A stunning shell for a shotgun."
@@ -1841,7 +1833,7 @@ datum/design/stunshell
 	req_tech = list("combat" = 3, "materials" = 3)
 	build_type = PROTOLATHE
 	materials = list("$metal" = 200)
-	build_path = "/obj/item/ammo_casing/shotgun/stunshell"
+	build_path = "/obj/item/ammo_casing/shotgun/stunslug"
 
 datum/design/techshell
 	name = "Unloaded Technological Shotshell"
@@ -1852,6 +1844,15 @@ datum/design/techshell
 	materials = list("$metal" = 1000, "$glass" = 200, "$silver" = 300)
 	build_path = "/obj/item/ammo_casing/shotgun/techshell"
 
+datum/design/suppressor
+	name = "Universal Suppressor"
+	desc = "A reverse-engineered universal suppressor that fits on most small arms with threaded barrels."
+	id = "suppressor"
+	req_tech = list("combat" = 6, "engineering" = 5, "syndicate" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 2000, "$silver" = 500)
+	build_path = /obj/item/weapon/suppressor
+
 datum/design/xray
 	name = "Xray Laser Gun"
 	desc = "Not quite as menacing as it sounds"

code/modules/shuttles/antagonist.dm

@@ -2,8 +2,16 @@
 	name = "skipjack control console"
 	req_access = list(access_syndicate)
 	shuttle_tag = "Vox Skipjack"
+	
+/obj/machinery/computer/shuttle_control/multi/vox/attack_ai(user as mob)
+	user << "\red Access Denied."
+	return 1	
 
 /obj/machinery/computer/shuttle_control/multi/syndicate
 	name = "Syndicate control console"
 	req_access = list(access_syndicate)
-	shuttle_tag = "Syndicate"
+	shuttle_tag = "Syndicate"
+	
+/obj/machinery/computer/shuttle_control/multi/syndicate/attack_ai(user as mob)
+	user << "\red Access Denied."
+	return 1	

code/modules/shuttles/departmental.dm

@@ -1,19 +1,19 @@
 /obj/machinery/computer/shuttle_control/mining
 	name = "mining shuttle console"
 	shuttle_tag = "Mining"
-	//req_access = list(access_mining)
+	req_access = list(access_mining)
 	circuit = /obj/item/weapon/circuitboard/mining_shuttle
 
 /obj/machinery/computer/shuttle_control/engineering
 	name = "engineering shuttle console"
 	shuttle_tag = "Engineering"
-	//req_one_access_txt = "11;24"
+	req_one_access_txt = "10;24"
 	circuit = /obj/item/weapon/circuitboard/engineering_shuttle
 
 /obj/machinery/computer/shuttle_control/research
 	name = "research shuttle console"
 	shuttle_tag = "Research"
-	//req_access = list(access_research)
+	req_access = list(access_xenoarch)
 	circuit = /obj/item/weapon/circuitboard/research_shuttle
 
 /obj/machinery/computer/shuttle_control/labor_camp

code/modules/telesci/telesci_computer.dm

@@ -3,6 +3,7 @@
 	desc = "Used to teleport objects to and from the telescience telepad."
 	icon_state = "teleport"
 	circuit = /obj/item/weapon/circuitboard/telesci_console
+	req_access = list(access_research)
 	var/sending = 1
 	var/obj/machinery/telepad/telepad = null
 	var/temp_msg = "Telescience control console initialized.<BR>Welcome."

paradise.dme

@@ -1341,8 +1341,8 @@
 #include "code\modules\projectiles\gun.dm"
 #include "code\modules\projectiles\projectile.dm"
 #include "code\modules\projectiles\targeting.dm"
+#include "code\modules\projectiles\ammunition\ammo_casings.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\alien.dm"
 #include "code\modules\projectiles\guns\energy.dm"
@@ -1358,7 +1358,8 @@
 #include "code\modules\projectiles\guns\magic\wand.dm"
 #include "code\modules\projectiles\guns\projectile\automatic.dm"
 #include "code\modules\projectiles\guns\projectile\crossbow.dm"
-#include "code\modules\projectiles\guns\projectile\launcher.dm"
+#include "code\modules\projectiles\guns\projectile\grenade launcher.dm"
+#include "code\modules\projectiles\guns\projectile\launchers.dm"
 #include "code\modules\projectiles\guns\projectile\pistol.dm"
 #include "code\modules\projectiles\guns\projectile\pneumatic.dm"
 #include "code\modules\projectiles\guns\projectile\revolver.dm"