diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm index 74ac142692c6..70f32bfb60f2 100644 --- a/_maps/shuttles/inteq/inteq_colossus.dmm +++ b/_maps/shuttles/inteq/inteq_colossus.dmm @@ -2224,9 +2224,7 @@ name = "folder" }, /obj/item/pen/fourcolor, -/obj/item/stamp/hos{ - name = "vanguard's rubber stamp" - }, +/obj/item/stamp/inteq/vanguard, /obj/item/reagent_containers/food/drinks/coffee{ pixel_y = 20 }, @@ -4212,9 +4210,7 @@ desc = "A slick black folder stamped 'Property of Inteq Risk Management Group.'"; name = "folder" }, -/obj/item/stamp/law{ - name = "master at arms' rubber stamp" - }, +/obj/item/stamp/inteq/maa, /obj/item/table_bell{ pixel_y = 13 }, diff --git a/_maps/shuttles/inteq/inteq_hound.dmm b/_maps/shuttles/inteq/inteq_hound.dmm index 42c34c5a418e..c6f9e34a653d 100644 --- a/_maps/shuttles/inteq/inteq_hound.dmm +++ b/_maps/shuttles/inteq/inteq_hound.dmm @@ -2343,9 +2343,7 @@ /obj/item/gps{ pixel_x = 12 }, -/obj/item/stamp/hos{ - name = "vanguard's rubber stamp" - }, +/obj/item/stamp/inteq/vanguard, /obj/item/pen/fountain, /turf/open/floor/plasteel/dark, /area/ship/bridge) diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 2ab9a9405507..79ec309513f8 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -2529,9 +2529,7 @@ /obj/effect/turf_decal/corner/opaque/yellow{ dir = 1 }, -/obj/item/stamp/hos{ - name = "vanguard's rubber stamp" - }, +/obj/item/stamp/inteq/vanguard, /obj/machinery/airalarm/directional/north, /turf/open/floor/plasteel/dark, /area/ship/bridge) @@ -5797,9 +5795,7 @@ desc = "A slick black folder stamped 'Property of Inteq Risk Management Group.'"; name = "folder" }, -/obj/item/stamp/law{ - name = "master at arms' rubber stamp" - }, +/obj/item/stamp/inteq/maa, /obj/item/table_bell{ pixel_x = -15 }, @@ -7830,9 +7826,7 @@ /obj/item/megaphone/cargo{ name = "engineering megaphone" }, -/obj/item/stamp/ce{ - name = "honorable artificer's rubber stamp" - }, +/obj/item/stamp/inteq/artificer, /obj/item/clothing/glasses/meson/engine, /obj/item/clothing/glasses/welding, /obj/item/pipe_dispenser, diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm index d35bcb7a808a..247743c165bf 100644 --- a/_maps/shuttles/inteq/inteq_valor.dmm +++ b/_maps/shuttles/inteq/inteq_valor.dmm @@ -4430,6 +4430,7 @@ /obj/item/storage/lockbox/medal/sec, /obj/item/clothing/glasses/hud/security/sunglasses/inteq, /obj/item/clothing/head/inteq_peaked, +/obj/item/stamp/inteq/vanguard, /turf/open/floor/carpet/orange, /area/ship/bridge) "Od" = ( @@ -4805,6 +4806,7 @@ /obj/item/clothing/glasses/hud/health/sunglasses, /obj/item/storage/box/hypospray/CMO, /obj/item/clothing/gloves/color/latex/nitrile, +/obj/item/stamp/inteq/corpsman, /turf/open/floor/carpet/blue, /area/ship/bridge) "RT" = ( diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm index 92e024ba7bf6..662ce9c5e3d6 100644 --- a/_maps/shuttles/inteq/inteq_vaquero.dmm +++ b/_maps/shuttles/inteq/inteq_vaquero.dmm @@ -684,9 +684,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, -/obj/item/stamp/hos{ - name = "vanguard's rubber stamp" - }, +/obj/item/stamp/inteq/vanguard, /obj/structure/cable{ icon_state = "1-8" }, @@ -3367,9 +3365,8 @@ name = "folder"; pixel_x = 5 }, -/obj/item/stamp/law{ - name = "master at arms' rubber stamp"; - pixel_x = 5 +/obj/item/stamp/inteq/maa{ + pixel_x = 6 }, /obj/item/table_bell{ pixel_x = -4; diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 4920de28e364..43d1d46f329c 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -114,9 +114,10 @@ "stamp-syndicate" = 'icons/stamp_icons/large_stamp-syndicate.png', "stamp-solgov" = 'icons/stamp_icons/large_stamp-solgov.png', "stamp-inteq" = 'icons/stamp_icons/large_stamp-inteq.png', - "stamp-vanguard" = 'icons/stamp_icons/large_stamp-vanguard.png', - "stamp-maa" = 'icons/stamp_icons/large_stamp-maa.png', - "stamp-artificer" = 'icons/stamp_icons/large_stamp-artificer.png', + "stamp-inteq_vanguard" = 'icons/stamp_icons/large_stamp-inteq_vanguard.png', + "stamp-inteq_maa" = 'icons/stamp_icons/large_stamp-inteq_maa.png', + "stamp-inteq_artificer" = 'icons/stamp_icons/large_stamp-inteq_artificer.png', + "stamp-inteq_corpsman" = 'icons/stamp_icons/large_stamp-inteq_corpsman.png', "stamp-clip" = 'icons/stamp_icons/large_stamp-clip.png', "stamp-bard" = 'icons/stamp_icons/large_stamp-bard.png', "stamp-gold" = 'icons/stamp_icons/large_stamp-gold.png', diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 22e9a722634b..4311eb080cf2 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -115,32 +115,33 @@ icon_state = "stamp-inteq" dye_color = DYE_QM -/obj/item/stamp/vanguard +/obj/item/stamp/inteq/vanguard name = "Vanguard's rubber stamp" - icon_state = "stamp-vanguard" - dye_color = DYE_QM + icon_state = "stamp-inteq_vanguard" -/obj/item/stamp/maa +/obj/item/stamp/inteq/maa name = "Master at Arms' rubber stamp" - icon_state = "stamp-maa" - dye_color = DYE_QM + icon_state = "stamp-inteq_maa" -/obj/item/stamp/artificer - name = "Class II Artificer's rubber stamp" - icon_state = "stamp-artificer" - dye_color = DYE_QM +/obj/item/stamp/inteq/artificer + name = "Honorable Artificer's rubber stamp" + icon_state = "stamp-inteq_artificer" + +/obj/item/stamp/inteq/corpsman + name = "Honorable Corpsman's rubber stamp" + icon_state = "stamp-inteq_corpsman" /obj/item/stamp/clip name = "CLIP Minutemen rubber stamp" icon_state = "stamp-cmm" dye_color = DYE_FO -/obj/item/stamp/gold +/obj/item/stamp/clip/gold name = "GOLD rubber stamp" icon_state = "stamp-gold" dye_color = DYE_FO -/obj/item/stamp/bard +/obj/item/stamp/clip/bard name = "BARD rubber stamp" icon_state = "stamp-bard" dye_color = DYE_FO diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 68fef79c160b..b56a287cc21b 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/icons/stamp_icons/large_stamp-artificer.png b/icons/stamp_icons/large_stamp-artificer.png deleted file mode 100644 index 058a4407428c..000000000000 Binary files a/icons/stamp_icons/large_stamp-artificer.png and /dev/null differ diff --git a/icons/stamp_icons/large_stamp-inteq_artificer.png b/icons/stamp_icons/large_stamp-inteq_artificer.png new file mode 100644 index 000000000000..fc75d381200e Binary files /dev/null and b/icons/stamp_icons/large_stamp-inteq_artificer.png differ diff --git a/icons/stamp_icons/large_stamp-inteq_corpsman.png b/icons/stamp_icons/large_stamp-inteq_corpsman.png new file mode 100644 index 000000000000..22b4f97c7e4c Binary files /dev/null and b/icons/stamp_icons/large_stamp-inteq_corpsman.png differ diff --git a/icons/stamp_icons/large_stamp-maa.png b/icons/stamp_icons/large_stamp-inteq_maa.png similarity index 100% rename from icons/stamp_icons/large_stamp-maa.png rename to icons/stamp_icons/large_stamp-inteq_maa.png diff --git a/icons/stamp_icons/large_stamp-vanguard.png b/icons/stamp_icons/large_stamp-inteq_vanguard.png similarity index 100% rename from icons/stamp_icons/large_stamp-vanguard.png rename to icons/stamp_icons/large_stamp-inteq_vanguard.png