roll back clean some stuff to...

cmss13-devs · Feb 15, 2024 · 5b5a1fb · 5b5a1fb
1 parent b49c140
commit 5b5a1fb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 66 deletions.
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
@@ -192,6 +192,8 @@
 		list("USCM Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch, VENDOR_ITEM_REGULAR),
 		list("Bedroll", round(scale * 20), /obj/item/roller/bedroll, VENDOR_ITEM_REGULAR),
 		list("Armor Painter", round(scale * 20), /obj/item/device/armor_painter, VENDOR_ITEM_REGULAR),
+		list("Armor Painter", round(scale * 20), /obj/item/device/floor_painter, VENDOR_ITEM_REGULAR),
+		list("Armor Painter", round(scale * 20), /obj/item/device/pipe_painter, VENDOR_ITEM_REGULAR),
 
 		list("OPTICS", -1, null, null, null),
 		list("Advanced Medical Optic (CORPSMAN ONLY)", round(scale * 4), /obj/item/device/helmet_visor/medical/advanced, VENDOR_ITEM_REGULAR),

diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm
@@ -1909,18 +1909,8 @@ GLOBAL_LIST_INIT(armor_paints_heavy, list("padded" = "H1", "padless" = "H2", "pa
 /obj/item/device/armor_painter/New()
 	..()
 	modes = new()
-	if(istype(A,/obj/item/clothing/suit/storage/marine/light))
-		to_chat(user, "it's an light armor.")
-		for(var/C in GLOB.armor_paints_light)
-			modes += "[C]"
-	if(istype(A,/obj/item/clothing/suit/storage/marine/medium))
-		to_chat(user, "it's an meduim armor.")
-		for(var/C in GLOB.armor_paints_medium)
-			modes += "[C]"
-	if(istype(A,/obj/item/clothing/suit/storage/marine/heavy))
-		to_chat(user, "it's an heavy armor.")
-		for(var/C in GLOB.armor_paints_heavy)
-			modes += "[C]"
+	for(var/C in GLOB.armor_paints)
+		modes += "[C]"
 	mode = pick(modes)
 
 /obj/item/device/armor_painter/afterattack(atom/A, mob/user as mob, proximity)
@@ -1955,57 +1945,3 @@ GLOBAL_LIST_INIT(armor_paints_heavy, list("padded" = "H1", "padless" = "H2", "pa
 	. = ..()
 	. += "It is in [mode] mode."
 
-
-/obj/item/clothing/suit/storage/marine/light/padded
-	icon_state = "L1"
-	armor_variation = 0
-
-/obj/item/clothing/suit/storage/marine/light/padless
-	icon_state = "L2"
-	armor_variation = 0
-
-/obj/item/clothing/suit/storage/marine/light/padless_lines
-	icon_state = "L3"
-	armor_variation = 0
-
-/obj/item/clothing/suit/storage/marine/light/carrier
-	icon_state = "L4"
-	armor_variation = 0
-
-/obj/item/clothing/suit/storage/marine/light/skull
-	icon_state = "L5"
-	armor_variation = 0
-
-/obj/item/clothing/suit/storage/marine/light/smooth
-	icon_state = "L6"
-	armor_variation = 0
-
-/obj/item/clothing/suit/storage/marine/medium/padded
-	name = "M3 pattern padded marine armor"
-	icon_state = "1"
-	specialty = "M3 pattern padded marine"
-
-/obj/item/clothing/suit/storage/marine/medium/padless
-	name = "M3 pattern padless marine armor"
-	icon_state = "2"
-	specialty = "M3 pattern padless marine"
-
-/obj/item/clothing/suit/storage/marine/medium/padless_lines
-	name = "M3 pattern ridged marine armor"
-	icon_state = "3"
-	specialty = "M3 pattern ridged marine"
-
-/obj/item/clothing/suit/storage/marine/medium/carrier
-	name = "M3 pattern carrier marine armor"
-	icon_state = "4"
-	specialty = "M3 pattern carrier marine"
-
-/obj/item/clothing/suit/storage/marine/medium/skull
-	name = "M3 pattern skull marine armor"
-	icon_state = "5"
-	specialty = "M3 pattern skull marine"
-
-/obj/item/clothing/suit/storage/marine/medium/smooth
-	name = "M3 pattern smooth marine armor"
-	icon_state = "6"
-	specialty = "M3 pattern smooth marine"