Skip to content

Commit

Permalink
Maps inteq stamps in. (shiptest-ss13#3533)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Replaces the HOS, Law and CE stamps with the inteq stamps that actually
exist already.
Also repaths IRMG and CLIP stamps.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Feels like an oversight. I think someone added them and forgot to
actually make them player-accessible.
Repathing because factional stamps together are nice.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: Added a honorable corpsman stamp and tweaked honorable arti one.
add: Inteq ships now use inteq stamps.
code: Repathed IRMG and CLIP stamps.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Sadhorizon authored Oct 14, 2024
1 parent bc0b195 commit be60401
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 39 deletions.
8 changes: 2 additions & 6 deletions _maps/shuttles/inteq/inteq_colossus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down Expand Up @@ -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
},
Expand Down
4 changes: 1 addition & 3 deletions _maps/shuttles/inteq/inteq_hound.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 3 additions & 9 deletions _maps/shuttles/inteq/inteq_talos.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
},
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 2 additions & 0 deletions _maps/shuttles/inteq/inteq_valor.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down
9 changes: 3 additions & 6 deletions _maps/shuttles/inteq/inteq_vaquero.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -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;
Expand Down
7 changes: 4 additions & 3 deletions code/modules/asset_cache/asset_list_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
25 changes: 13 additions & 12 deletions code/modules/paperwork/stamps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified icons/obj/bureaucracy.dmi
Binary file not shown.
Binary file removed icons/stamp_icons/large_stamp-artificer.png
Binary file not shown.
Binary file added icons/stamp_icons/large_stamp-inteq_artificer.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-inteq_corpsman.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes

0 comments on commit be60401

Please sign in to comment.