diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index ca6dbd7467..4f01f57d14 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -83,6 +83,26 @@ prob: 0.001 - id: ClothingHeadHatCatEars prob: 0.01 + # - Pins + - id: ClothingNeckLGBTPin + prob: 0.025 + orGroup: LGBTQIAPlusPins + - id: ClothingNeckAromanticPin + orGroup: LGBTQIAPlusPins + - id: ClothingNeckAsexualPin + orGroup: LGBTQIAPlusPins + - id: ClothingNeckBisexualPin + orGroup: LGBTQIAPlusPins + - id: ClothingNeckIntersexPin + orGroup: LGBTQIAPlusPins + - id: ClothingNeckLesbianPin + orGroup: LGBTQIAPlusPins + - id: ClothingNeckNonBinaryPin + orGroup: LGBTQIAPlusPins + - id: ClothingNeckPansexualPin + orGroup: LGBTQIAPlusPins + - id: ClothingNeckTransPin + orGroup: LGBTQIAPlusPins # TRAITOR EQUIPMENT (0.01%) - id: Telecrystal10 prob: 0.0001 diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml new file mode 100644 index 0000000000..cc9c2dd636 --- /dev/null +++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml @@ -0,0 +1,143 @@ +- type: entity + parent: ClothingNeckBase + id: ClothingNeckLGBTPin + name: LGBT pin + description: be gay do crime + components: + - type: Sprite + sprite: Clothing/Neck/Misc/pins.rsi + layers: + - state: lgbt + - type: Clothing + sprite: Clothing/Neck/Misc/pins.rsi + clothingVisuals: + neck: + - state: lgbt-equipped + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckAromanticPin + name: aromantic pin + description: be aro do crime + components: + - type: Sprite + sprite: Clothing/Neck/Misc/pins.rsi + layers: + - state: aro + - type: Clothing + sprite: Clothing/Neck/Misc/pins.rsi + clothingVisuals: + neck: + - state: aro-equipped + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckAsexualPin + name: asexual pin + description: be ace do crime + components: + - type: Sprite + sprite: Clothing/Neck/Misc/pins.rsi + layers: + - state: asex + - type: Clothing + sprite: Clothing/Neck/Misc/pins.rsi + clothingVisuals: + neck: + - state: asex-equipped + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckBisexualPin + name: bisexual pin + description: be bi do crime + components: + - type: Sprite + sprite: Clothing/Neck/Misc/pins.rsi + layers: + - state: bi + - type: Clothing + sprite: Clothing/Neck/Misc/pins.rsi + clothingVisuals: + neck: + - state: bi-equipped + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckIntersexPin + name: intersex pin + description: be intersex do crime + components: + - type: Sprite + sprite: Clothing/Neck/Misc/pins.rsi + layers: + - state: inter + - type: Clothing + sprite: Clothing/Neck/Misc/pins.rsi + clothingVisuals: + neck: + - state: inter-equipped + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckLesbianPin + name: lesbian pin + description: be lesbian do crime + components: + - type: Sprite + sprite: Clothing/Neck/Misc/pins.rsi + layers: + - state: les + - type: Clothing + sprite: Clothing/Neck/Misc/pins.rsi + clothingVisuals: + neck: + - state: les-equipped + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckNonBinaryPin + name: non-binary pin + description: "01100010 01100101 00100000 01100101 01101110 01100010 01111001 00100000 01100100 01101111 00100000 01100011 01110010 01101001 01101101 01100101" + components: + - type: Sprite + sprite: Clothing/Neck/Misc/pins.rsi + layers: + - state: non + - type: Clothing + sprite: Clothing/Neck/Misc/pins.rsi + clothingVisuals: + neck: + - state: non-equipped + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckPansexualPin + name: pansexual pin + description: be pan do crime + components: + - type: Sprite + sprite: Clothing/Neck/Misc/pins.rsi + layers: + - state: pan + - type: Clothing + sprite: Clothing/Neck/Misc/pins.rsi + clothingVisuals: + neck: + - state: pan-equipped + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckTransPin + name: transgender pin + description: be trans do crime + components: + - type: Sprite + sprite: Clothing/Neck/Misc/pins.rsi + layers: + - state: trans + - type: Clothing + sprite: Clothing/Neck/Misc/pins.rsi + clothingVisuals: + neck: + - state: trans-equipped diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index da17826f6b..3883bea6d6 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -25,6 +25,15 @@ - Skub - ClothingHeadHatCatEars - DrinkMugDog + - ClothingNeckLGBTPin + - ClothingNeckAromanticPin + - ClothingNeckAsexualPin + - ClothingNeckBisexualPin + - ClothingNeckIntersexPin + - ClothingNeckLesbianPin + - ClothingNeckNonBinaryPin + - ClothingNeckPansexualPin + - ClothingNeckTransPin rareChance: 0.01 prototypes: - Lighter diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped.png new file mode 100644 index 0000000000..ce50d896bc Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro.png new file mode 100644 index 0000000000..8cf2346e58 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped.png new file mode 100644 index 0000000000..1d74f67b20 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex.png new file mode 100644 index 0000000000..7df1114ffe Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped.png new file mode 100644 index 0000000000..cb9e1dd8bd Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi.png new file mode 100644 index 0000000000..d6d32b8bbb Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped.png new file mode 100644 index 0000000000..d72f516ec2 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter.png new file mode 100644 index 0000000000..c191729a24 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped.png new file mode 100644 index 0000000000..1b49e05cc8 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les.png new file mode 100644 index 0000000000..87fb3443b9 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped.png new file mode 100644 index 0000000000..1bdd3de51e Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt.png new file mode 100644 index 0000000000..8d48afe448 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json new file mode 100644 index 0000000000..57fab6a8ba --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json @@ -0,0 +1,74 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "PixelTK leaves his mark on upstream", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "aro" + }, + { + "name": "aro-equipped", + "directions": 4 + }, + { + "name": "asex" + }, + { + "name": "asex-equipped", + "directions": 4 + }, + { + "name": "bi" + }, + { + "name": "bi-equipped", + "directions": 4 + }, + { + "name": "inter" + }, + { + "name": "inter-equipped", + "directions": 4 + }, + { + "name": "les" + }, + { + "name": "les-equipped", + "directions": 4 + }, + { + "name": "lgbt" + }, + { + "name": "lgbt-equipped", + "directions": 4 + }, + { + "name": "non" + }, + { + "name": "non-equipped", + "directions": 4 + }, + { + "name": "pan" + }, + { + "name": "pan-equipped", + "directions": 4 + }, + { + "name": "trans" + }, + { + "name": "trans-equipped", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped.png new file mode 100644 index 0000000000..7774132a4d Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non.png new file mode 100644 index 0000000000..9346d5fa6a Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped.png new file mode 100644 index 0000000000..bdd61cbd83 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan.png new file mode 100644 index 0000000000..b74d31e792 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped.png new file mode 100644 index 0000000000..500797c103 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans.png new file mode 100644 index 0000000000..a47420daa6 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans.png differ