Merge branch 'master' into upstream-merge-13193

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

@@ -44,6 +44,7 @@
 	name = "floral somatoray"
 	desc = "A tool that discharges controlled radiation which induces mutation in plant cells."
 	description_fluff = "The floral somatoray is a relatively recent invention of the NanoTrasen corporation, turning a process that once involved transferring plants to massive mutating racks, into a remote interface. Do not look directly into the transmission end."
+	icon = 'icons/obj/gun.dmi' //CHOMPedit
 	icon_state = "floramut100"
 	item_state = "floramut"
 	projectile_type = /obj/item/projectile/energy/floramut

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

@@ -17,7 +17,7 @@
 	name = "advanced SMG"
 	desc = "An advanced submachine gun with a reflective laser optic that makes burst fire less inaccurate than other SMGs. Uses 9mm rounds."
 	icon = 'icons/obj/gun.dmi'
-	icon_state = "advanced_smg-empty"
+	icon_state = "advanced_smg-e" //CHOMPedit
 	w_class = ITEMSIZE_NORMAL
 	load_method = MAGAZINE
 	caliber = "9mm"
@@ -33,7 +33,7 @@
 
 /obj/item/weapon/gun/projectile/automatic/advanced_smg/update_icon()
 	..()
-	icon_state = (ammo_magazine)? "advanced_smg" : "advanced_smg-empty"
+	icon_state = (ammo_magazine)? "advanced_smg" : "advanced_smg-e" //CHOMPedit
 	return
 
 /obj/item/weapon/gun/projectile/automatic/advanced_smg/loaded
@@ -365,7 +365,7 @@
 		icon_state = "mini-uzi"
 	else
 		icon_state = "mini-uzi-empty"
-		
+
 // CHOMPEdit: Uzi tilting
 /obj/item/weapon/gun/projectile/automatic/mini_uzi/Initialize()
 	. = ..()

code/modules/projectiles/guns/toy.dm

@@ -54,6 +54,19 @@
 	handle_casings = null
 	recoil = 0 //it's a toy //CHOMP Edit
 
+/*
+ * Moist Nugget
+ */
+/obj/item/weapon/gun/projectile/shotgun/pump/toy/moistnugget
+	name = "\improper Donk-Soft mosin-nagant"
+	desc = "Donk-Soft foam mosin-nagant! It's Donk or Don't! Ages 8 and up."
+	description_fluff = "A special Donk-Soft rifle originally made to pair with a Soviet Soldier costume. It didn't catch on quite as well as other Donk-Soft products."
+	icon = 'icons/obj/gun_toy.dmi'
+	icon_state = "moistnugget"
+	item_state = "moistnugget"
+	max_shells = 5
+	matter = list(MAT_PLASTIC = 2500)
+
 /*
  * Pistol
  */

code/modules/projectiles/projectile/bullets.dm

@@ -58,6 +58,10 @@
 		if(D.glass) chance *= 2
 	else if(istype(A, /obj/structure/girder))
 		chance = 100
+	else if(istype(A, /obj/machinery/door/airlock/voidcraft)) //CHOMPEDIT Begin, lets the code see shuttlecraft structures and not treat them as air.
+		chance = 0
+	else if(istype(A, /turf/simulated/shuttle/wall))
+		chance = 0 //CHOMPEDIT End. Yeah, shuttlecraft can handle small arms fire just fine.
 
 	if(prob(chance))
 		if(A.opacity)