Skip to content

Commit

Permalink
New Faction Specific Stamps (#2652)
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

Adds stamps for various ShipTest specific factions which lacked them.
For now they're only available for administrator spawn and I'll add them
to their respective ships properly in a separate PR. Primarily this is
for my own sanity of not continuing to suffer executive dysfunction by
touching .dmis and so people re/mapping ships can add them if
applicable.

On-paper
<img width="210" alt="rctHIwKQ80"
src="https://github.com/shiptest-ss13/Shiptest/assets/46308162/feb22c6e-b28f-4423-9621-8d1b50de917c">

Higher resolution stamps

![large_stamp-vanguard](https://github.com/shiptest-ss13/Shiptest/assets/46308162/3fe2e30c-b33c-43f8-a36f-491830cc05d8)

![large_stamp-artificer](https://github.com/shiptest-ss13/Shiptest/assets/46308162/a9dd6941-fad4-4724-830a-5add4bf05af0)

![large_stamp-inteq](https://github.com/shiptest-ss13/Shiptest/assets/46308162/a159941e-94a6-458b-b367-5e6f2e7a5148)

![large_stamp-maa](https://github.com/shiptest-ss13/Shiptest/assets/46308162/3a0eac97-f7b7-4be2-890a-613fa4355158)

![large_stamp-bard](https://github.com/shiptest-ss13/Shiptest/assets/46308162/bf010d3f-d50b-4d48-83c0-6f66c22f7112)

![large_stamp-cmm](https://github.com/shiptest-ss13/Shiptest/assets/46308162/4dda8293-8ae9-4c07-ba58-5c9108238bc9)

![large_stamp-gold](https://github.com/shiptest-ss13/Shiptest/assets/46308162/2bd599fb-938e-42fb-ad21-f27896471db0)

![large_stamp-cybersun](https://github.com/shiptest-ss13/Shiptest/assets/46308162/5a704c69-331c-4676-b90e-af3c6b550be0)

![large_stamp-donk](https://github.com/shiptest-ss13/Shiptest/assets/46308162/91382782-2df7-4c3b-9d9e-a815aecbb464)


## Why It's Good For The Game

Currently factions like Inteq Risk Management, the Colonial Minutemen,
and Syndicate subfactions are using vanilla stamps which oftentimes feel
out of place. Adding stamps for the command structure of Inteq, GOLD and
BARD of the Minutemen, as well as for Donk! Co. and Cybersun lets
players and admins have flavor in an otherwise relatively anemic part of
the game.

## Changelog

:cl:
add: Added new ShipTest faction specific 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. -->

Co-authored-by: meem <[email protected]>
  • Loading branch information
Luftkommando and meemofcourse authored Feb 4, 2024
1 parent f8a04f9 commit 54c95db
Show file tree
Hide file tree
Showing 12 changed files with 55 additions and 1 deletion.
11 changes: 10 additions & 1 deletion code/modules/asset_cache/asset_list_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,16 @@
"stamp-mime" = 'icons/stamp_icons/large_stamp-mime.png',
"stamp-centcom" = 'icons/stamp_icons/large_stamp-centcom.png',
"stamp-syndicate" = 'icons/stamp_icons/large_stamp-syndicate.png',
"stamp-solgov" = 'icons/stamp_icons/large_stamp-solgov.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-cmm" = 'icons/stamp_icons/large_stamp-cmm.png',
"stamp-bard" = 'icons/stamp_icons/large_stamp-bard.png',
"stamp-gold" = 'icons/stamp_icons/large_stamp-gold.png',
"stamp-cybersun" = 'icons/stamp_icons/large_stamp-cybersun.png',
"stamp-donk" = 'icons/stamp_icons/large_stamp-donk.png'
)

/datum/asset/simple/fuckywucky
Expand Down
45 changes: 45 additions & 0 deletions code/modules/paperwork/stamps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,54 @@
icon_state = "stamp-syndicate"
dye_color = DYE_SYNDICATE

/obj/item/stamp/donk
name = "Donk! Co. rubber stamp"
icon_state = "stamp-donk"
dye_color = DYE_SYNDICATE

/obj/item/stamp/cybersun
name = "Cybersun rubber stamp"
icon_state = "stamp-cybersun"
dye_color = DYE_SYNDICATE

/obj/item/stamp/solgov
name = "SolGov rubber stamp"
icon_state = "stamp-solgov"

/obj/item/stamp/inteq
name = "Inteq rubber stamp"
icon_state = "stamp-inteq"
dye_color = DYE_QM

/obj/item/stamp/vanguard
name = "Vanguard's rubber stamp"
icon_state = "stamp-vanguard"
dye_color = DYE_QM

/obj/item/stamp/maa
name = "Master at Arms' rubber stamp"
icon_state = "stamp-maa"
dye_color = DYE_QM

/obj/item/stamp/artificer
name = "Class II Artificer's rubber stamp"
icon_state = "stamp-artificer"
dye_color = DYE_QM

/obj/item/stamp/cmm
name = "Colonial Minutemen rubber stamp"
icon_state = "stamp-cmm"
dye_color = DYE_FO

/obj/item/stamp/gold
name = "GOLD rubber stamp"
icon_state = "stamp-gold"
dye_color = DYE_FO

/obj/item/stamp/bard
name = "BARD rubber stamp"
icon_state = "stamp-bard"
dye_color = DYE_FO

/obj/item/stamp/attack_paw(mob/user)
return attack_hand(user)
Binary file modified icons/obj/bureaucracy.dmi
Binary file not shown.
Binary file added icons/stamp_icons/large_stamp-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-bard.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-cmm.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-cybersun.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-donk.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-gold.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.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-maa.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-vanguard.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 54c95db

Please sign in to comment.