Revert "cant stop wont stop (tgstation#11081)"

This reverts commit 0ca4c41.

code/__DEFINES/attachments.dm

@@ -19,8 +19,6 @@
 #define MOB_PIXEL_SHIFT_Y "mob_pixel_shift_y"
 #define ATTACHMENT_LAYER "attachment_layer"
 
-#define GREYSCALE_ATTACHMENT_ICONSTATE "attached"
-
 //flags_attach_features
 #define ATTACH_REMOVABLE (1<<0)
 #define ATTACH_ACTIVATION (1<<1)

code/datums/components/attachment_handler.dm

@@ -298,10 +298,7 @@
 
 		var/icon = attachment_data[OVERLAY_ICON]
 		var/icon_state = attachment.icon_state
-		if(attachment.greyscale_colors && attachment.greyscale_config)
-			icon_state = GREYSCALE_ATTACHMENT_ICONSTATE
-			icon = attachment.icon
-		else if(attachment_data[OVERLAY_ICON] == attachment.icon)
+		if(attachment_data[OVERLAY_ICON] == attachment.icon)
 			icon_state = attachment.icon_state + "_a"
 		if(CHECK_BITFIELD(attachment_data[FLAGS_ATTACH_FEATURES], ATTACH_SAME_ICON))
 			icon_state = attachment.icon_state

code/datums/greyscale/greyscale_configs.dm

@@ -349,51 +349,14 @@
 /datum/greyscale_config/gun/worn/r_hand/t35
 	icon_file = 'icons/Marine/gun_greyscale/t35/right_hand.dmi'
 
-//SG-29
 
-/datum/greyscale_config/gun/t29
-	icon_file = 'icons/Marine/gun_greyscale/t29/t29.dmi'
-
-/datum/greyscale_config/gun/worn/t29
-	icon_file = 'icons/Marine/gun_greyscale/t29/back.dmi'
-
-/datum/greyscale_config/gun/worn/suit/t29
-	icon_file = 'icons/Marine/gun_greyscale/t29/suit.dmi'
-
-/datum/greyscale_config/gun/worn/l_hand/t29
-	icon_file = 'icons/Marine/gun_greyscale/t29/left_hand.dmi'
-
-/datum/greyscale_config/gun/worn/r_hand/t29
-	icon_file = 'icons/Marine/gun_greyscale/t29/right_hand.dmi'
-
-//AR-21
-/datum/greyscale_config/gun/t21
-	icon_file = 'icons/Marine/gun_greyscale/t21/t21.dmi'
-
-/datum/greyscale_config/gun/worn/t21
-	icon_file = 'icons/Marine/gun_greyscale/t21/back.dmi'
-
-/datum/greyscale_config/gun/worn/suit/t21
-	icon_file = 'icons/Marine/gun_greyscale/t21/suit.dmi'
-
-/datum/greyscale_config/gun/worn/l_hand/t21
-	icon_file = 'icons/Marine/gun_greyscale/t21/left_hand.dmi'
-
-/datum/greyscale_config/gun/worn/r_hand/t21
-	icon_file = 'icons/Marine/gun_greyscale/t21/right_hand.dmi'
 
 
 ///Gun attachments
 /datum/greyscale_config/gun_attachment
 	icon_file = 'icons/Marine/gun_attachments_greyscale/t35_stock.dmi'
 	json_config = 'code/datums/greyscale/json_configs/gun_attachment.json'
 
-/datum/greyscale_config/gun_attachment/verticalgrip
-	icon_file = 'icons/Marine/gun_attachments_greyscale/vertical_grip.dmi'
-
-/datum/greyscale_config/gun_attachment/angledgrip
-	icon_file = 'icons/Marine/gun_attachments_greyscale/angled_grip.dmi'
-
 /*
  * MECHS
  */

code/datums/greyscale/json_configs/gun_attachment.json

@@ -23,30 +23,5 @@
 			"icon_state": "uncolored",
 			"blend_mode": "overlay"
 		}
-	],
-	"attached" : [
-		{
-			"type": "icon_state",
-			"icon_state": "color_1_a",
-			"blend_mode": "overlay",
-			"color_ids": [ 1 ]
-		},
-		{
-			"type": "icon_state",
-			"icon_state": "color_2_a",
-			"blend_mode": "overlay",
-			"color_ids": [ 2 ]
-		},
-		{
-			"type": "icon_state",
-			"icon_state": "color_3_a",
-			"blend_mode": "overlay",
-			"color_ids": [ 3 ]
-		},
-		{
-			"type": "icon_state",
-			"icon_state": "uncolored_a",
-			"blend_mode": "overlay"
-		}
 	]
 }

code/modules/projectiles/gun_attachables.dm

@@ -520,6 +520,13 @@ inaccurate. Don't worry if force is ever negative, it won't runtime.
 	damage_mod = -0.15
 	gun_firemode_list_mod = list(GUN_FIREMODE_AUTOMATIC)
 
+/obj/item/attachable/sgbarrel
+	name = "SG-29 barrel"
+	icon_state = "sg29barrel"
+	desc = "A heavy barrel. CANNOT BE REMOVED."
+	slot = ATTACHMENT_SLOT_MUZZLE
+	flags_attach_features = NONE
+
 ///////////// Rail attachments ////////////////////////
 
 /obj/item/attachable/reddot
@@ -934,6 +941,13 @@ inaccurate. Don't worry if force is ever negative, it won't runtime.
 	pixel_shift_x = 32
 	pixel_shift_y = 13
 
+/obj/item/attachable/stock/sgstock
+	name = "SG-29 stock"
+	desc = "A standard machinegun stock."
+	icon_state = "sg29stock"
+	pixel_shift_x = 32
+	pixel_shift_y = 13
+
 /obj/item/attachable/stock/revolver
 	name = "\improper M44 magnum sharpshooter stock"
 	desc = "A wooden stock modified for use on a 44-magnum. Increases accuracy and reduces recoil at the expense of handling and agility."
@@ -1054,7 +1068,6 @@ inaccurate. Don't worry if force is ever negative, it won't runtime.
 	scatter_unwielded_mod = 3
 	aim_speed_mod	= -0.1
 	aim_mode_movement_mult = -0.2
-	greyscale_config = /datum/greyscale_config/gun_attachment/verticalgrip
 
 
 /obj/item/attachable/angledgrip
@@ -1069,7 +1082,6 @@ inaccurate. Don't worry if force is ever negative, it won't runtime.
 	scatter_mod = 2
 	accuracy_unwielded_mod = -0.1
 	scatter_unwielded_mod = 1
-	greyscale_config = /datum/greyscale_config/gun_attachment/angledgrip
 
 
 

code/modules/projectiles/guns/rifles.dm

@@ -1061,12 +1061,6 @@
 	desc = "The Raummetall-KT SG-29 is the TGMC's current standard IFF-capable medium machine gun. It's known for its ability to lay down heavy fire support very well. It is generally used when someone wants to hold a position or provide fire support. Requires special training and it cannot turn off IFF. It uses 10x26mm ammunition."
 	icon_state = "sg29"
 	item_state = "sg29"
-	item_icons = list(
-		slot_l_hand_str = /datum/greyscale_config/gun/worn/l_hand/t29,
-		slot_r_hand_str = /datum/greyscale_config/gun/worn/r_hand/t29,
-		slot_back_str = /datum/greyscale_config/gun/worn/t29,
-		slot_s_store_str = /datum/greyscale_config/gun/worn/suit/t29,
-	)
 	caliber = CALIBER_10x26_CASELESS //codex
 	max_shells = 300 //codex
 	force = 30
@@ -1088,11 +1082,14 @@
 		/obj/item/attachable/scope/mini,
 		/obj/item/attachable/motiondetector,
 		/obj/item/attachable/buildasentry,
+		/obj/item/attachable/stock/sgstock,
+		/obj/item/attachable/sgbarrel,
 		/obj/item/attachable/shoulder_mount,
 	)
 
 	flags_gun_features = GUN_AMMO_COUNTER|GUN_WIELDED_FIRING_ONLY|GUN_IFF
 	gun_firemode_list = list(GUN_FIREMODE_SEMIAUTO, GUN_FIREMODE_AUTOMATIC)
+	starting_attachment_types = list(/obj/item/attachable/stock/sgstock, /obj/item/attachable/sgbarrel)
 	gun_skill_category = GUN_SKILL_SMARTGUN //Uses SG skill for the penalties.
 	attachable_offset = list("muzzle_x" = 42, "muzzle_y" = 17,"rail_x" = 15, "rail_y" = 21, "under_x" = 24, "under_y" = 14, "stock_x" = 12, "stock_y" = 13)
 	fire_delay = 0.2 SECONDS
@@ -1103,15 +1100,13 @@
 	scatter_unwielded = 40
 	movement_acc_penalty_mult = 4
 
-	greyscale_config = /datum/greyscale_config/gun/t29
-
 	placed_overlay_iconstate = "smartgun"
 
 /obj/item/weapon/gun/rifle/standard_smartmachinegun/pmc
-	starting_attachment_types = list(/obj/item/attachable/magnetic_harness)
+	starting_attachment_types = list(/obj/item/attachable/stock/sgstock, /obj/item/attachable/sgbarrel, /obj/item/attachable/magnetic_harness)
 
 /obj/item/weapon/gun/rifle/standard_smartmachinegun/patrol
-	starting_attachment_types = list(/obj/item/attachable/motiondetector, /obj/item/attachable/bipod)
+	starting_attachment_types = list(/obj/item/attachable/stock/sgstock, /obj/item/attachable/sgbarrel, /obj/item/attachable/motiondetector, /obj/item/attachable/bipod)
 
 //-------------------------------------------------------
 //Sectoid Rifle
@@ -1334,12 +1329,6 @@
 	icon = 'icons/Marine/gun64.dmi'
 	icon_state = "t21"
 	item_state = "t21"
-	item_icons = list(
-		slot_l_hand_str = /datum/greyscale_config/gun/worn/l_hand/t21,
-		slot_r_hand_str = /datum/greyscale_config/gun/worn/r_hand/t21,
-		slot_back_str = /datum/greyscale_config/gun/worn/t21,
-		slot_s_store_str = /datum/greyscale_config/gun/worn/suit/t21,
-	)
 	fire_sound = 'sound/weapons/guns/fire/t21.ogg'
 	dry_fire_sound = 'sound/weapons/guns/fire/t21_empty.ogg'
 	unload_sound = 'sound/weapons/guns/interact/t21_unload.ogg'
@@ -1391,8 +1380,6 @@
 	aim_slowdown = 0.5
 	damage_falloff_mult = 0.5
 
-	greyscale_config = /datum/greyscale_config/gun/t21
-
 /obj/item/weapon/gun/rifle/standard_skirmishrifle/standard
 	starting_attachment_types = list(
 		/obj/item/attachable/reddot,