Merge branch 'forest/paperwork' into project/fax_responders/test_merge

cmss13-devs · Dec 13, 2024 · f15a083 · f15a083
2 parents c189181 + 9edf958
commit f15a083
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm
@@ -362,7 +362,8 @@ GLOBAL_LIST_INIT(allowed_hat_items, list(
 	/obj/item/tool/pen = PREFIX_HAT_GARB_OVERRIDE,
 	/obj/item/tool/pen/blue = PREFIX_HAT_GARB_OVERRIDE,
 	/obj/item/tool/pen/red = PREFIX_HAT_GARB_OVERRIDE,
-	/obj/item/tool/pen/multicolor = NO_GARB_OVERRIDE,
+	/obj/item/tool/pen/multicolor/fountain = NO_GARB_OVERRIDE,
+	/obj/item/tool/pen/multicolor/provost = NO_GARB_OVERRIDE,
 	/obj/item/clothing/glasses/welding = "welding-c",
 	/obj/item/clothing/glasses/mgoggles = PREFIX_HAT_GARB_OVERRIDE,
 	/obj/item/clothing/glasses/mgoggles/prescription = PREFIX_HAT_GARB_OVERRIDE,

diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
@@ -248,7 +248,8 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	/obj/item/tool/pen = PREFIX_HELMET_GARB_OVERRIDE, // helmet_
 	/obj/item/tool/pen/blue = PREFIX_HELMET_GARB_OVERRIDE, // helmet_
 	/obj/item/tool/pen/red = PREFIX_HELMET_GARB_OVERRIDE, // helmet_
-	/obj/item/tool/pen/multicolor = NO_GARB_OVERRIDE,
+	/obj/item/tool/pen/multicolor/fountain = NO_GARB_OVERRIDE,
+	/obj/item/tool/pen/multicolor/provost = NO_GARB_OVERRIDE,
 	/obj/item/clothing/glasses/welding = NO_GARB_OVERRIDE,
 	/obj/item/clothing/head/headband = NO_GARB_OVERRIDE,
 	/obj/item/clothing/head/headband/tan = NO_GARB_OVERRIDE,