From ba6853d386e392560c528c6fba93bda97a32cd02 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Fri, 14 Jun 2024 19:22:01 +0200 Subject: [PATCH 1/2] It is pride month, nukies. You know what that means. (#28992) * Make the nuke gay * I forgot to commit the gay * Add pride month * Use holiday visualizer for nuke * Fix pride month * Trans too --- .../Locale/en-US/holiday/greet/holiday-greet.ftl | 1 + .../Entities/Structures/Machines/nuke.yml | 14 ++++++++++++++ Resources/Prototypes/holidays.yml | 7 +++++++ .../Textures/Objects/Devices/nuke.rsi/meta.json | 5 ++++- .../Objects/Devices/nuke.rsi/nuclearbomb_gay.png | Bin 0 -> 1396 bytes 5 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png diff --git a/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl b/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl index fde896df39b..2080f42c634 100644 --- a/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl +++ b/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl @@ -69,6 +69,7 @@ holiday-name-festive-season = Festive Season holiday-name-boxing-day = Boxing Day holiday-name-friday-thirteenth = Friday the 13th holiday-name-national-coming-out-day = National Coming Out Day +holiday-name-pride-month = Pride Month ## Custom congrats diff --git a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml index bc4581d7b65..1cf9ceaeab3 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml @@ -16,6 +16,9 @@ map: ["enum.NukeVisualLayers.Unlit"] shader: unshaded visible: false + - state: nuclearbomb_gay + map: ["pride"] + visible: false - state: nukefestive map: ["christmas"] visible: false @@ -24,11 +27,15 @@ holidays: festive: - FestiveSeason + pride: + - PrideMonth - type: GenericVisualizer visuals: enum.HolidayVisuals.Holiday: christmas: festive: { visible: true } + pride: + pride: { visible: true } enum.NukeVisuals.Deployed: enum.NukeVisualLayers.Base: False: { state: nuclearbomb_base } @@ -129,16 +136,23 @@ - state: nukefestive map: ["christmas"] visible: false + - state: nuclearbomb_gay + map: [ "pride" ] + visible: false - type: Appearance - type: HolidayVisuals holidays: festive: - FestiveSeason + pride: + - PrideMonth - type: GenericVisualizer visuals: enum.HolidayVisuals.Holiday: christmas: festive: { visible: true } + pride: + pride: { visible: true } - type: Physics bodyType: Dynamic - type: Fixtures diff --git a/Resources/Prototypes/holidays.yml b/Resources/Prototypes/holidays.yml index 235584dd636..173999d156b 100644 --- a/Resources/Prototypes/holidays.yml +++ b/Resources/Prototypes/holidays.yml @@ -437,3 +437,10 @@ name: holiday-name-friday-thirteenth shouldCelebrate: !type:FridayThirteenth { } + +- type: holiday + id: PrideMonth + name: holiday-name-pride-month + beginDay: 1 + endDay: 31 + beginMonth: June diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json index 4bc62a96b2d..5ba8a2d753c 100644 --- a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/835fd60545178a19064f5df9981dac6e1b220775/icons/obj/stationobjs.dmi, nukefestive by Alekshhh (Github)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/835fd60545178a19064f5df9981dac6e1b220775/icons/obj/stationobjs.dmi, nukefestive by Alekshhh (Github), nuclearbomb_gay by PJB3005", "size": { "x": 32, "y": 32 @@ -13,6 +13,9 @@ { "name": "nuclearbomb_deployed_unlit" }, + { + "name": "nuclearbomb_gay" + }, { "name": "nukefestive", "delays": [ diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png new file mode 100644 index 0000000000000000000000000000000000000000..7cc17bc3a264a251d35ccabaa02477d51c6f6765 GIT binary patch literal 1396 zcmV-)1&jKLP)Px)E=fc|R9J=WmTOE?XBfwSMPNGRIw};A>P7=iqg!J%ZlD;KnW$lq>Ac5eq%kpB zh8gjeDT>P`nqAcBn3rJY4Hr;w%^-7`QDTp%gFs z;1~Z%)AzjZbNN62=gD~wyuvHIWT*liXh;x-?%8M$X#b)J4wQT~pVCV=0Ou$kF-YR% z7y%$O#G#DiL-%sS@WuKOkdjL{M=_Z!_al)wIYv->9@8~$H0tqT0PNl)66ov@Z5~xX z%sAOa7>q z4HvP^C}h{7E|wjh55W6>h-dS56|ryMR%XnK2kwnny);#qfxnMd!6&l;2=XeMVS1K* zH^8*!&lqipmu(6*hfq}5N%q<}0E!Ab$;vQLTTw4p@9=nJ`<(G^78pb1XGIH!qAWIn zlHlXCJpK~gR&ZNoIROqG7|W{cCQ8e?akls2Z11DAteaKYP3YDbad^c3OK9|oU9-Co zBn3>ST;bOvKl>4g&nzHsHdw#fP09VeOb@-!B8Nc!)(wNzel6RUo1F^ZqQXw}g9==4 z_A1bSrIwmot=L_neUQnNE9i8FVHFS#CE!|>fc}dOd>o#`frv=*f85FXEk96R*+N!E zG$)F5oG8-CJ{9K;RGc@Ey*7^P%}NCTe%rYPyUWS;om;2_Rgm4@fmW+wp=qfffr(5W zd;y6#)%65`)YJu3S63)(OUt?yt#G#Y0VrDLOF}}B*<7qTdGZ)Koq;z@u?oXBn$fsA z=&b^5rL0hkBU4>nL2Bv(*5y3}l=4gKQ@g|=9I61oU%;eTJuo-}W^=I$5Yo~<02ACi za#c27Xj%$Sz&@*kJG@1@j{>iU!@9hO?AZ}bRz|c}slns`ouLtcM@|foF+K*%;Chr~ z=x%gv9~d)$(KwTkNue~|sORvRjil%zNzp~}rZ${e?~1)n(M2+E?sQ7Z&hzj=9}Z6| znhD4F{^0L4wAAxjuNd=}h6$`t2T}S@7*4mF+z*q8=?TKsAI$wxW4QCck*|0UTr*z= zVCBly^4_)`d;KKL&_vV}~S=w4Y3HP!Q(Gdq`yRkzTnU`=uo?@bf!rzQf^l4z`P z;pz{jEz~;~G6Csp$80V}YDalxJ^6V#062SkiH?e(>dG}hoCD&bNOr>A#!eN$-NtVL zxC_kbaru2wNy(=OU076VV1!SyjEv<%TG|IRHPw^;@3}x`0pY0kD4w0}0W2ytq3Khw zSS%zvq1f9sTE`VB*lkZBv*(7zV!>*)s?h5N>`%E1=HC8OUWZ2q)6)8w=&+~W z;3N82tyWoeyV%OxcY-3)O+qrBp~#9y&(M`Ja|x8vSf)M z?LCXHuTNI2{+WIK2uSPa4KUQ_x%^)w;me5mzwsY9q7jp%If9-50000 Date: Fri, 14 Jun 2024 17:23:07 +0000 Subject: [PATCH 2/2] Automatic changelog update --- Resources/Changelog/Changelog.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index b0f8885e1f7..1f4117595c5 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: EmoGarbage404 - changes: - - message: Ninjas no longer wipe all technologies when using their gloves on a research - server. - type: Tweak - id: 6232 - time: '2024-03-26T00:52:27.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26421 - author: Dutch-VanDerLinde changes: - message: The chest rig is now available for purchase in the syndicate uplink. @@ -3848,3 +3840,12 @@ id: 6731 time: '2024-06-14T16:53:49.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28989 +- author: PJB3005 + changes: + - message: Added pride month. + type: Add + - message: Made the nuke gay. + type: Add + id: 6732 + time: '2024-06-14T17:22:01.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28992