diff --git a/code/game/machinery/fax_machine.dm b/code/game/machinery/fax_machine.dm
index 783d24c00f2e..ff26ce802b08 100644
--- a/code/game/machinery/fax_machine.dm
+++ b/code/game/machinery/fax_machine.dm
@@ -396,7 +396,7 @@ var/list/alldepartments = list()
P.stamps += "
This paper has been stamped by the USCM High Command Quantum Relay."
if("NC4 UA Federal Secure Network - CMB Relay")
var/image/stampoverlay = image('icons/obj/items/paper.dmi')
- stampoverlay.icon_state = "paper_stamp-uscm" // placeholder icon
+ stampoverlay.icon_state = "paper_stamp-cmb"
if(!P.stamped)
P.stamped = new
P.stamped += /obj/item/tool/stamp
@@ -404,7 +404,7 @@ var/list/alldepartments = list()
P.stamps += "
This paper has been stamped by The Office of Colonial Marshals."
if("Weyland-Yutani Quantum Relay")
var/image/stampoverlay = image('icons/obj/items/paper.dmi')
- stampoverlay.icon_state = "paper_stamp-cent"
+ stampoverlay.icon_state = "paper_stamp-weyyu"
if(!P.stamped)
P.stamped = new
P.stamped += /obj/item/tool/stamp
diff --git a/code/game/objects/items/tools/misc_tools.dm b/code/game/objects/items/tools/misc_tools.dm
index 505006285881..b5be55eed540 100644
--- a/code/game/objects/items/tools/misc_tools.dm
+++ b/code/game/objects/items/tools/misc_tools.dm
@@ -420,12 +420,20 @@
name = "internal affairs rubber stamp"
icon_state = "stamp-intaff"
-/obj/item/tool/stamp/centcomm
- name = "centcomm rubber stamp"
- icon_state = "stamp-cent"
+/obj/item/tool/stamp/weyyu
+ name = "WY rubber stamp"
+ icon_state = "stamp-weyyu"
+
+/obj/item/tool/stamp/uscm
+ name = "USCM rubber stamp"
+ icon_state = "stamp-uscm"
+
+/obj/item/tool/stamp/cmb
+ name = "CMB rubber stamp"
+ icon_state = "stamp-cmb"
/obj/item/tool/stamp/ro
- name = "requisitions officer's rubber stamp"
+ name = "quartermaster's rubber stamp"
icon_state = "stamp-ro"
/obj/item/tool/carpenters_hammer //doesn't do anything, yet
diff --git a/code/modules/admin/topic/topic.dm b/code/modules/admin/topic/topic.dm
index a76be10e9c26..d7f6d7159675 100644
--- a/code/modules/admin/topic/topic.dm
+++ b/code/modules/admin/topic/topic.dm
@@ -1502,7 +1502,7 @@
// Stamps
var/image/stampoverlay = image('icons/obj/items/paper.dmi')
- stampoverlay.icon_state = "paper_stamp-cent"
+ stampoverlay.icon_state = "paper_stamp-weyyu"
if(!P.stamped)
P.stamped = new
P.stamped += /obj/item/tool/stamp
@@ -1584,7 +1584,7 @@
// Stamps
var/image/stampoverlay = image('icons/obj/items/paper.dmi')
- stampoverlay.icon_state = "paper_stamp-cent"
+ stampoverlay.icon_state = "paper_stamp-cmb"
if(!P.stamped)
P.stamped = new
P.stamped += /obj/item/tool/stamp
diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm
index ecf76b577c1d..2e9142dcef91 100644
--- a/code/modules/economy/ATM.dm
+++ b/code/modules/economy/ATM.dm
@@ -358,7 +358,7 @@ log transactions
//stamp the paper
var/image/stampoverlay = image('icons/obj/items/paper.dmi')
- stampoverlay.icon_state = "paper_stamp-cent"
+ stampoverlay.icon_state = "paper_stamp-weyyu"
if(!R.stamped)
R.stamped = new
R.stamped += /obj/item/tool/stamp
@@ -400,7 +400,7 @@ log transactions
//stamp the paper
var/image/stampoverlay = image('icons/obj/items/paper.dmi')
- stampoverlay.icon_state = "paper_stamp-cent"
+ stampoverlay.icon_state = "paper_stamp-weyyu"
if(!R.stamped)
R.stamped = new
R.stamped += /obj/item/tool/stamp
diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm
index fbaf1f52adea..a5b36fd0bf3e 100644
--- a/code/modules/economy/EFTPOS.dm
+++ b/code/modules/economy/EFTPOS.dm
@@ -47,12 +47,12 @@
//stamp the paper
var/image/stampoverlay = image('icons/obj/items/paper.dmi')
- stampoverlay.icon_state = "paper_stamp-cent"
+ stampoverlay.icon_state = "paper_stamp-rd"
if(!R.stamped)
R.stamped = new
R.offset_x += 0
R.offset_y += 0
- R.ico += "paper_stamp-cent"
+ R.ico += "paper_stamp-rd"
R.stamped += /obj/item/tool/stamp
R.overlays += stampoverlay
R.stamps += "
This paper has been stamped by the EFTPOS device."
@@ -70,7 +70,7 @@
//stamp the paper
var/image/stampoverlay = image('icons/obj/items/paper.dmi')
- stampoverlay.icon_state = "paper_stamp-cent"
+ stampoverlay.icon_state = "paper_stamp-rd"
if(!R.stamped)
R.stamped = new
R.stamped += /obj/item/tool/stamp
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 3b10c757f2f4..f78ca9ef5473 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -427,7 +427,7 @@
var/image/stampoverlay = image('icons/obj/items/paper.dmi')
var/x
var/y
- if(istype(P, /obj/item/tool/stamp/captain) || istype(P, /obj/item/tool/stamp/centcomm))
+ if(istype(P, /obj/item/tool/stamp/captain) || istype(P, /obj/item/tool/stamp/weyyu))
x = rand(-2, 0)
y = rand(-1, 2)
else
diff --git a/icons/obj/items/paper.dmi b/icons/obj/items/paper.dmi
index d0c918a65e59..c39fede23679 100644
Binary files a/icons/obj/items/paper.dmi and b/icons/obj/items/paper.dmi differ
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index 8007d13db89e..eb05927b5f18 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -32952,8 +32952,7 @@
eftpos_name = "Cargo Bay EFTPOS scanner";
pixel_x = -10
},
-/obj/item/tool/stamp{
- name = "Requisition Officer's stamp";
+/obj/item/tool/stamp/ro{
pixel_x = -8;
pixel_y = 10
},
@@ -63207,7 +63206,7 @@
"rBx" = (
/obj/structure/surface/table/reinforced/almayer_B,
/obj/item/tool/stamp/ro{
- name = "spare requisitions officer's rubber stamp";
+ name = "spare quartermaster's rubber stamp";
pixel_x = -7;
pixel_y = 11
},