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.

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

Adds NGR stamps and secret docs. #3550

Merged
merged 5 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
21 changes: 12 additions & 9 deletions _maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -762,9 +762,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
/obj/item/stamp/qm{
name = "foreman's rubber stamp"
},
/obj/item/stamp/ngr/foreman,
/obj/machinery/button/shieldwallgen{
dir = 1;
id = "hyena_cargo";
Expand Down Expand Up @@ -795,10 +793,12 @@
/area/ship/bridge)
"oF" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/documents/syndicate/mining,
/obj/structure/filingcabinet,
/obj/structure/filingcabinet{
dir = 1
},
/obj/machinery/firealarm/directional/west,
/obj/effect/turf_decal/borderfloorblack,
/obj/item/folder/documents/syndicate/ngr,
/turf/open/floor/plasteel/tech/grid,
/area/ship/bridge)
"oJ" = (
Expand Down Expand Up @@ -1870,14 +1870,17 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/paper_bin/carbon,
/obj/item/folder/documents/syndicate/red,
/obj/item/pen/fountain/captain,
/obj/item/stamp/hos{
name = "captain's rubber stamp"
},
/obj/effect/turf_decal/borderfloorblack{
dir = 1
},
/obj/item/stamp/ngr{
pixel_x = 13;
pixel_y = 7
},
/obj/item/stamp/ngr/captain{
pixel_x = 13
},
/turf/open/floor/plasteel/tech/grid,
/area/ship/bridge)
"Ge" = (
Expand Down
5 changes: 5 additions & 0 deletions code/game/objects/items/documents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@
/obj/item/documents/syndicate/mining
desc = "\"Top Secret\" documents detailing Syndicate plasma mining operations."

/obj/item/documents/syndicate/ngr
name = "Second Battlegroup secret documents"
desc = "\"Top Secret\" documents belonging to the Second Battlegroup of New Gorlex Republic. They are filled with sensitive operational intelligence. These documents are verified with a red wax seal."
icon_state = "docs_red"

/obj/item/documents/photocopy
desc = "A copy of some top-secret documents. Nobody will notice they aren't the originals... right?"
var/forgedseal = 0
Expand Down
7 changes: 6 additions & 1 deletion code/modules/asset_cache/asset_list_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,12 @@
"stamp-gold" = 'icons/stamp_icons/large_stamp-gold.png',
"stamp-cybersun" = 'icons/stamp_icons/large_stamp-cybersun.png',
"stamp-biodynamics" = 'icons/stamp_icons/large_stamp-biodynamics.png',
"stamp-donk" = 'icons/stamp_icons/large_stamp-donk.png'
"stamp-donk" = 'icons/stamp_icons/large_stamp-donk.png',
"stamp-ngr" = 'icons/stamp_icons/large_stamp-ngr.png',
"stamp-ngr_cap" = 'icons/stamp_icons/large_stamp-ngr_captain.png',
"stamp-ngr_fore" = 'icons/stamp_icons/large_stamp-ngr_foreman.png',
"stamp-ngr_lieu" = 'icons/stamp_icons/large_stamp-ngr_lieutenant.png',
"stamp-ngr_ensign" = 'icons/stamp_icons/large_stamp-ngr_ensign.png'
)

/datum/asset/simple/fuckywucky
Expand Down
4 changes: 4 additions & 0 deletions code/modules/paperwork/folders_premade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@
/obj/item/folder/documents/syndicate/mining
document = /obj/item/documents/syndicate/mining

/obj/item/folder/documents/syndicate/ngr
document = /obj/item/documents/syndicate/ngr
icon_state = "folder_ngr"

/obj/item/folder/documents/solgov
document = /obj/item/documents/solgov
desc = "A blue folder with a SolGov seal."
Expand Down
25 changes: 25 additions & 0 deletions code/modules/paperwork/stamps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,31 @@
icon_state = "stamp-biodynamics"
dye_color = DYE_CMO

/obj/item/stamp/ngr
name = "New Gorlex Republic rubber stamp"
icon_state = "stamp-ngr"
dye_color = DYE_REDCOAT

/obj/item/stamp/ngr/captain
name = "Captain's rubber stamp"
icon_state = "stamp-ngr_cap"
dye_color = DYE_QM

/obj/item/stamp/ngr/foreman
name = "Foreman's rubber stamp"
icon_state = "stamp-ngr_fore"
dye_color = DYE_QM

/obj/item/stamp/ngr/lieutenant
name = "Lieutenant's rubber stamp"
icon_state = "stamp-ngr_lieu"
dye_color = DYE_QM

/obj/item/stamp/ngr/ensign
name = "Ensign's rubber stamp"
icon_state = "stamp-ngr_ensign"
dye_color = DYE_QM

/obj/item/stamp/solgov
name = "SolGov rubber stamp"
icon_state = "stamp-solgov"
Expand Down
Binary file modified icons/obj/bureaucracy.dmi
Binary file not shown.
Binary file added icons/stamp_icons/large_stamp-ngr.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/stamp_icons/large_stamp-ngr_captain.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/stamp_icons/large_stamp-ngr_ensign.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/stamp_icons/large_stamp-ngr_foreman.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading