Skip to content

Commit

Permalink
Paper Stamp Tweaks (#4406)
Browse files Browse the repository at this point in the history
# About the pull request
Makes the stamps a little bit more consistent and stops the confusion
between WeyYu and centcom.

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
imageadd: Added a CMB stamp icon.
imageadd: Changes the icon_state name of the WY stamp from centcom to
weyyu.
add: Changes EFTPOS stamp icon to use RD instead of weyyu.
fix: Changes the pre-spawned QMs stamp to use the proper stamp.
spellcheck: Renames Requisiton Officer's stamp to Quartermaster's Stamp.
maptweak: Renamed the spare Req Officer's stamp to spare Quartermaster's
stamp.
/:cl:
  • Loading branch information
realforest2001 committed Sep 13, 2023
1 parent a36d580 commit a5e4016
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 17 deletions.
4 changes: 2 additions & 2 deletions code/game/machinery/fax_machine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -396,15 +396,15 @@ var/list/alldepartments = list()
P.stamps += "<HR><i>This paper has been stamped by the USCM High Command Quantum Relay.</i>"
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
P.overlays += stampoverlay
P.stamps += "<HR><i>This paper has been stamped by The Office of Colonial Marshals.</i>"
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
Expand Down
16 changes: 12 additions & 4 deletions code/game/objects/items/tools/misc_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/modules/admin/topic/topic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/modules/economy/ATM.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions code/modules/economy/EFTPOS.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 += "<HR><i>This paper has been stamped by the EFTPOS device.</i>"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/paperwork/paper.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified icons/obj/items/paper.dmi
Binary file not shown.
5 changes: 2 additions & 3 deletions maps/map_files/USS_Almayer/USS_Almayer.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down Expand Up @@ -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
},
Expand Down

0 comments on commit a5e4016

Please sign in to comment.