Merge remote-tracking branch 'refs/remotes/wizards/master'

# Conflicts: # Resources/Textures/Objects/Devices/nuke.rsi/meta.json
space-sunrise · Jun 14, 2024 · 372ab3a · 372ab3a
2 parents 3234035 + 2711ef7
commit 372ab3a
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 8 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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