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

diff --git a/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl b/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl
index fde896df39bb0f634247d09c1048d7c87d3e895b..2080f42c63483cfa1f766a32a387283ba0b604ad 100644 (file)
--- 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 bc4581d7b6536560f90f47ed2cf2243b7bf71a23..1cf9ceaeab348912fbd671673356dec626267e57 100644 (file)
--- 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 235584dd6363149c448f7ffa98820d5487505585..173999d156b0d79e2ec507a86e4dbd6122e79384 100644 (file)
--- 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 4bc62a96b2db6a6c9b304667c9dc4714622bf2e8..5ba8a2d753cb98260232285f689bed4ba0e540a7 100644 (file)
--- 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 (file)
index 0000000..7cc17bc
Binary files /dev/null and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png differ