Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Paper Stamp Tweaks #4406

Merged
merged 6 commits into from
Sep 13, 2023
Merged

Paper Stamp Tweaks #4406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
93408c2
cmb/wy stamps
realforest2001 Sep 12, 2023
5f8b380
quatermaster?
realforest2001 Sep 12, 2023
1f1ea3c
smh didn't save it
realforest2001 Sep 12, 2023
dfc1bb1
oops. Forgot to change the iconstate
realforest2001 Sep 12, 2023
0de7f67
fix
realforest2001 Sep 12, 2023
a83b1c6
errr. fix for real
realforest2001 Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/game/machinery/fax_machine.dm
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Binary file not shown.
5 changes: 2 additions & 3 deletions maps/map_files/USS_Almayer/USS_Almayer.dmm
View file
Open in desktop
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