From e5a678f874542726261e193ffe617f8e881b0dfd Mon Sep 17 00:00:00 2001 From: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com> Date: Wed, 6 Dec 2023 09:11:14 -0800 Subject: [PATCH] Adds "Merged" and "Closed" stamps (#820) ## About The Pull Request Adds "Merged" and "Closed" stamps, along with fluff paper containing a random amount of randomly generated pull requests. They can be found in a briefcase in the RD's locker, or rarely in maint. ![image](https://github.com/Bubberstation/Bubberstation/assets/8602857/90fc5d89-a7fe-4dfe-8914-10e62abd8b75) ## Why It's Good For The Game That damn griefer george melons came to me in a dream and asked me to make funny stamps. They can be found in the research director's locker, and also in maint. ## Changelog :cl: BurgerBB add: Adds "Merged" and "Closed" stamps. They can be found in the research director's locker. /:cl: --- code/modules/asset_cache/assets/paper.dm | 6 ++ icons/stamp_icons/large_stamp-closed.png | Bin 0 -> 2355 bytes icons/stamp_icons/large_stamp-merged.png | Bin 0 -> 2088 bytes .../lists/maintenance_loot_rare.dm | 1 + .../game/objects/items/storage/briefcase.dm | 7 ++ .../closets/secure/scientist.dm | 3 + .../code/modules/paperwork/folders_premade.dm | 8 +++ .../code/modules/paperwork/paper_premade.dm | 65 ++++++++++++++++++ .../code/modules/paperwork/stamps.dm | 14 ++++ .../icons/obj/service/bureaucracy.dmi | Bin 0 -> 342 bytes tgstation.dme | 5 ++ 11 files changed, 109 insertions(+) create mode 100644 icons/stamp_icons/large_stamp-closed.png create mode 100644 icons/stamp_icons/large_stamp-merged.png create mode 100644 modular_zubbers/code/game/objects/items/storage/briefcase.dm create mode 100644 modular_zubbers/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm create mode 100644 modular_zubbers/code/modules/paperwork/folders_premade.dm create mode 100644 modular_zubbers/code/modules/paperwork/paper_premade.dm create mode 100644 modular_zubbers/code/modules/paperwork/stamps.dm create mode 100644 modular_zubbers/icons/obj/service/bureaucracy.dmi diff --git a/code/modules/asset_cache/assets/paper.dm b/code/modules/asset_cache/assets/paper.dm index 8653cff0dd1..32601e587fb 100644 --- a/code/modules/asset_cache/assets/paper.dm +++ b/code/modules/asset_cache/assets/paper.dm @@ -18,6 +18,11 @@ "stamp-solfed" = 'modular_skyrat/master_files/icons/stamp_icons/large_stamp-solfed.png', // SKYRAT ADDITION: END - Other stamp icons + //BUBBERSTATION ADDITION: START - Bubberstation Stamp Icons + "stamp-merged" = 'icons/stamp_icons/large_stamp-merged.png', + "stamp-closed" = 'icons/stamp_icons/large_stamp-closed.png', + //BUBBERSTATION ADDITION: END - Bubberstation Stamp Icons + "stamp-clown" = 'icons/stamp_icons/large_stamp-clown.png', "stamp-deny" = 'icons/stamp_icons/large_stamp-deny.png', "stamp-ok" = 'icons/stamp_icons/large_stamp-ok.png', @@ -34,4 +39,5 @@ "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' + ) diff --git a/icons/stamp_icons/large_stamp-closed.png b/icons/stamp_icons/large_stamp-closed.png new file mode 100644 index 0000000000000000000000000000000000000000..cc1857c7176f3d105e4b1477e64e4c3fbbd7c69d GIT binary patch literal 2355 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 Z{{!@IgP8IYuD1XH002ovPDHLkV1l-^k6Qo$ literal 0 HcmV?d00001 diff --git a/icons/stamp_icons/large_stamp-merged.png b/icons/stamp_icons/large_stamp-merged.png new file mode 100644 index 0000000000000000000000000000000000000000..cb92debdbd19c002a382a9578e3b83cd99813b4a GIT binary patch literal 2088 zcmV+@2-o+CP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T-D=BC7t49O-*eCJ?(9D2{(bJVKkj_sa?W%9-E)86 z^ZT81uQR1kC=?2XLZMJ75<=r?8V9y^bltf9o6dg*Qat}@1MQLWq7?O~I#$RL+X3q9 zcTcZ+D)$>RXzU>3_NO_C^NTxM-(M1YTkeQs``NA2rL%bF|@Wf0+mCZX5Y8F3@+qH{a>g|I@Hp@Z8+AMe8>X2$wq0k*II8N) zm2F!1d53;>$$+jY`deiujUz!?X;z3~iCV~4~@0cwY?m7aC1dY9Hcc~+A`-LI1 zt@WO{rZRmIW(%pv?)NUQ4Lu51ng&e@-4GHNi3{Ios%eA2 z^qQCXZwKozwz_Nxzwz@|ea3-LhuOV~o_~}zA=(c8&2tv-mN1df@9@4`Mq~X= zBQ0!(82il)wud9?G}QMRC-xb}rS|)=ZEDTI`OF#gjtrzC(>s@JfVg|Zz^!{MbfZ56 z?Q9t~Aug|G_5bwVV|j#amI>f|t8FNF%;G(ztWWnT`>;2T<@T!y_k}-)0W7D<*zWc*|)}%=Mi&v(cI^1VqZ-(HsXmI*QxJEwgzWhVe zzbq|!;c+We+r~a|bjil&=Jd%tPsRXnDZ7iijz(}sMGU85|?FV0Q~){<2!W@1*kaI@&SxRDs%C*+wcGw^QkC-lVA6T8o6RS$vPi4lU#M@} zQ>@qRd}O=}h8X+YwNbYCDvvDDUf*4)SJyAnaehEq5Uw&c+9k z&O^2k|NTDTyh_Pv*xqThb=$^XT{T}@y}=giwDrb?)QeBPxXbz!R?O2@uFKUr8t zV6+_l(`;z+5A#Vv_O|qp{_%jHRv^^rI#a^F5=})KYPy_PJ-Qmtj7*v5fkt%kqBJ6% zuEmfY#hVrJft{^|RRg~Jz5g!s4&V+qf=D|c5ts;eM5!@IPz(t-7ly}Dmw!;N`!ijp6+qKgj+=pdJE=)Q3c>qho$ZjumG2BIPD%abm$B0D7F$rBBo z5@~f#SLiv2q@M@lyT|krS^5fdxmK%3XJxCeLTe! zV|`d~qfA#UO*ZT}QQId)(6fs33OmO*&+c_%S4hAXHJRI#LZMJ76p9C(RO)|A9T|ro SNvh)j0000[title] #[pr_number] + [author] wants to merge [dirty_commits] commits into \[Space-Station-13:master\] from \[[author_dash]:[branch]\] +
+
+
+
+
+
+

About The Pull Request

+
+

Removes [thing_to_remove].

+
+

Why It's Good For The Station

+
+

[redpill]

+

+ [pick("The Research Directior needs","Security needs","We need","Central Command needs","Nanotrasen needs")] to remove [thing_to_remove] from + [pick("the Station","the Crew",job,location)]. [pick("You might be thinking","You're probablly wondering","You might be saying","One might think","Some might say")] + "[conversation]", [pick("so let me explain","and you'd normally be right","but let me explain","so let me have a moment of your time","give me a second to explain")]. +

+ [pick("One time","Previously","Last shift","A few moments ago")] that damn griefer george melons was [traitor] [pick("as","while they were")] [job] and [pick("he","they")] + [pick("killed","assaulted","ass slapped","smacked","bwoinked")] [pick("me","my person","my well being","my ass")] [pick("in","near","around")] [location] + [pick("with","using","while I didn't have any")] [thing_to_remove]. This [pick("should not have happened","was fucking stupid","made me cry","wasted my time","annoyed me")] so I am + [pick("petitioning","begging","asking","demanding")] for it to be removed. +

+
+

Changelog

+
+ CL [author]
+ [pick("del","remove","balance","fix","bugfix")]: Removes [thing_to_remove]
+ /CL + "} + + name = "[initial(name)] - pull request #[pr_number], [title]" + + return ..() diff --git a/modular_zubbers/code/modules/paperwork/stamps.dm b/modular_zubbers/code/modules/paperwork/stamps.dm new file mode 100644 index 00000000000..e7649726bc9 --- /dev/null +++ b/modular_zubbers/code/modules/paperwork/stamps.dm @@ -0,0 +1,14 @@ +/obj/item/stamp/coderbus + icon = 'modular_zubbers/icons/obj/service/bureaucracy.dmi' + icon_state = null + desc = "A rubber stamp for stamping unimportant requests." + +/obj/item/stamp/coderbus/merged + name = "merged rubber stamp" + icon_state = "stamp-merged" + dye_color = DYE_PURPLE + +/obj/item/stamp/coderbus/closed + name = "closed rubber stamp" + icon_state = "stamp-closed" + dye_color = DYE_RED diff --git a/modular_zubbers/icons/obj/service/bureaucracy.dmi b/modular_zubbers/icons/obj/service/bureaucracy.dmi new file mode 100644 index 0000000000000000000000000000000000000000..25aa8fab52565cf9b346b13ce5a33d8791fc232a GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQgQ)4A+84w8~`%y?d|L9>({Se zpOuvr8XBsqs+#GvJy%4e?cK=>KxxL3AirP+hi5m^fSmHGkcbkO)Z*l#%z~24{5%GR ziaEhy1x2ObzXTV2{Q5-8TUYDcne)LLLJck&KX{~b-beE!Ls3uf4h!QTT3Ec~4eRaM3eFGmo@;Rxa#l|IFRJcr3_1Q9~8yQ`bi$8T2YKMgtd@W|Q zW@T6+s%3pWLRAFlgk(<_#}JF&Q|Z#Tva*tz@Y6W` g+?)djTr0R3>P>}o;3boFyt=akR{0BzQQ+5i9m literal 0 HcmV?d00001 diff --git a/tgstation.dme b/tgstation.dme index 43b4e4cb377..5c5e3240905 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8017,9 +8017,11 @@ #include "modular_zubbers\code\game\objects\items\robot\robot_upgrades\adv_plasmacutter_upgrade.dm" #include "modular_zubbers\code\game\objects\items\stacks\medical.dm" #include "modular_zubbers\code\game\objects\items\storage\boxes.dm" +#include "modular_zubbers\code\game\objects\items\storage\briefcase.dm" #include "modular_zubbers\code\game\objects\items\storage\guncases.dm" #include "modular_zubbers\code\game\objects\structures\trash_pile.dm" #include "modular_zubbers\code\game\objects\structures\beds_chairs\sofa.dm" +#include "modular_zubbers\code\game\objects\structures\crates_lockers\closets\secure\scientist.dm" #include "modular_zubbers\code\game\objects\structures\plaques\static_plaques.dm" #include "modular_zubbers\code\game\traits\negative.dm" #include "modular_zubbers\code\game\traits\neutral.dm" @@ -8134,6 +8136,9 @@ #include "modular_zubbers\code\modules\opposing_force\code\equipment\antagonist_powers.dm" #include "modular_zubbers\code\modules\pai\ghost_pai.dm" #include "modular_zubbers\code\modules\paperwork\fax.dm" +#include "modular_zubbers\code\modules\paperwork\folders_premade.dm" +#include "modular_zubbers\code\modules\paperwork\paper_premade.dm" +#include "modular_zubbers\code\modules\paperwork\stamps.dm" #include "modular_zubbers\code\modules\power\supermatter\supermatter_gas.dm" #include "modular_zubbers\code\modules\projectiles\ammunition\ballistic\smg.dm" #include "modular_zubbers\code\modules\projectiles\boxes_magazines\external\smg.dm"