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
This commit is contained in:
committed by
GitHub
parent
9efa5de340
commit
ba6853d386
@@ -69,6 +69,7 @@ holiday-name-festive-season = Festive Season
|
|||||||
holiday-name-boxing-day = Boxing Day
|
holiday-name-boxing-day = Boxing Day
|
||||||
holiday-name-friday-thirteenth = Friday the 13th
|
holiday-name-friday-thirteenth = Friday the 13th
|
||||||
holiday-name-national-coming-out-day = National Coming Out Day
|
holiday-name-national-coming-out-day = National Coming Out Day
|
||||||
|
holiday-name-pride-month = Pride Month
|
||||||
|
|
||||||
## Custom congrats
|
## Custom congrats
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,9 @@
|
|||||||
map: ["enum.NukeVisualLayers.Unlit"]
|
map: ["enum.NukeVisualLayers.Unlit"]
|
||||||
shader: unshaded
|
shader: unshaded
|
||||||
visible: false
|
visible: false
|
||||||
|
- state: nuclearbomb_gay
|
||||||
|
map: ["pride"]
|
||||||
|
visible: false
|
||||||
- state: nukefestive
|
- state: nukefestive
|
||||||
map: ["christmas"]
|
map: ["christmas"]
|
||||||
visible: false
|
visible: false
|
||||||
@@ -24,11 +27,15 @@
|
|||||||
holidays:
|
holidays:
|
||||||
festive:
|
festive:
|
||||||
- FestiveSeason
|
- FestiveSeason
|
||||||
|
pride:
|
||||||
|
- PrideMonth
|
||||||
- type: GenericVisualizer
|
- type: GenericVisualizer
|
||||||
visuals:
|
visuals:
|
||||||
enum.HolidayVisuals.Holiday:
|
enum.HolidayVisuals.Holiday:
|
||||||
christmas:
|
christmas:
|
||||||
festive: { visible: true }
|
festive: { visible: true }
|
||||||
|
pride:
|
||||||
|
pride: { visible: true }
|
||||||
enum.NukeVisuals.Deployed:
|
enum.NukeVisuals.Deployed:
|
||||||
enum.NukeVisualLayers.Base:
|
enum.NukeVisualLayers.Base:
|
||||||
False: { state: nuclearbomb_base }
|
False: { state: nuclearbomb_base }
|
||||||
@@ -129,16 +136,23 @@
|
|||||||
- state: nukefestive
|
- state: nukefestive
|
||||||
map: ["christmas"]
|
map: ["christmas"]
|
||||||
visible: false
|
visible: false
|
||||||
|
- state: nuclearbomb_gay
|
||||||
|
map: [ "pride" ]
|
||||||
|
visible: false
|
||||||
- type: Appearance
|
- type: Appearance
|
||||||
- type: HolidayVisuals
|
- type: HolidayVisuals
|
||||||
holidays:
|
holidays:
|
||||||
festive:
|
festive:
|
||||||
- FestiveSeason
|
- FestiveSeason
|
||||||
|
pride:
|
||||||
|
- PrideMonth
|
||||||
- type: GenericVisualizer
|
- type: GenericVisualizer
|
||||||
visuals:
|
visuals:
|
||||||
enum.HolidayVisuals.Holiday:
|
enum.HolidayVisuals.Holiday:
|
||||||
christmas:
|
christmas:
|
||||||
festive: { visible: true }
|
festive: { visible: true }
|
||||||
|
pride:
|
||||||
|
pride: { visible: true }
|
||||||
- type: Physics
|
- type: Physics
|
||||||
bodyType: Dynamic
|
bodyType: Dynamic
|
||||||
- type: Fixtures
|
- type: Fixtures
|
||||||
|
|||||||
@@ -437,3 +437,10 @@
|
|||||||
name: holiday-name-friday-thirteenth
|
name: holiday-name-friday-thirteenth
|
||||||
shouldCelebrate:
|
shouldCelebrate:
|
||||||
!type:FridayThirteenth { }
|
!type:FridayThirteenth { }
|
||||||
|
|
||||||
|
- type: holiday
|
||||||
|
id: PrideMonth
|
||||||
|
name: holiday-name-pride-month
|
||||||
|
beginDay: 1
|
||||||
|
endDay: 31
|
||||||
|
beginMonth: June
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"license": "CC-BY-SA-3.0",
|
"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": {
|
"size": {
|
||||||
"x": 32,
|
"x": 32,
|
||||||
"y": 32
|
"y": 32
|
||||||
@@ -13,6 +13,9 @@
|
|||||||
{
|
{
|
||||||
"name": "nuclearbomb_deployed_unlit"
|
"name": "nuclearbomb_deployed_unlit"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "nuclearbomb_gay"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "nukefestive",
|
"name": "nukefestive",
|
||||||
"delays": [
|
"delays": [
|
||||||
|
|||||||
BIN
Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png
Normal file
BIN
Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
Reference in New Issue
Block a user