Merge pull request #2656 from FluffyTox/Dingo's-sillystuff

Dingo's sillystuff
ARF-SS13 · Jul 19, 2023 · 8e297f2 · 8e297f2
2 parents cfdd1a2 + 4cffdf5
commit 8e297f2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -678,6 +678,15 @@
 	can_suppress = FALSE
 	fire_sound = 'sound/f13weapons/44mag.ogg'
 	gun_accuracy_zone_type = ZONE_WEIGHT_PRECISION
+/* * * * * * * * * *
+* .44 automag copycat. same as the original one
+* * * * * * * * */
+
+/obj/item/gun/ballistic/automatic/pistol/automag/Toxhalogun
+	name = "Custom M6G Magnum"
+	desc = "A custom gold plated M6G magnum. The magnum itself has a built in smart scope alongside black wooden furniture."
+	icon_state = "m6gold"
+	item_state = "m6gold"
 
 /* * * * * * * * * * *
  * 14mm Semi-Auto

diff --git a/icons/fallout/objects/guns/ballistic.dmi b/icons/fallout/objects/guns/ballistic.dmi
diff --git a/icons/fallout/onmob/weapons/guns_lefthand.dmi b/icons/fallout/onmob/weapons/guns_lefthand.dmi
diff --git a/icons/fallout/onmob/weapons/guns_righthand.dmi b/icons/fallout/onmob/weapons/guns_righthand.dmi