FGM-148 Javelin Anti Tank Guided Missile

Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-vending.ftl

@@ -1,2 +0,0 @@
-ent-CrateVendingMachineRestockPride = { ent-CrateVendingMachineRestockPrideFilled }
-    .desc = { ent-CrateVendingMachineRestockPrideFilled.desc }

Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl

@@ -1,2 +0,0 @@
-ent-CrateVendingMachineRestockPrideFilled = Pride-O-Mat restock crate
-    .desc = Contains a restock box for the Pride-O-Mat.

Resources/Locale/en-US/holiday/greet/holiday-greet.ftl

@@ -44,7 +44,6 @@ holiday-name-friendship-day = Friendship Day
 holiday-name-beer-day = Beer Day
 holiday-name-talk-like-a-pirate-day = Talk-Like-a-Pirate Day
 holiday-name-programmers-day = Programmers' Day
-holiday-name-bisexual-pride-day = Bisexual Pride Day
 holiday-name-stupid-questions-day = Stupid-Questions Day
 holiday-name-animals-day = Animal's Day
 holiday-name-smiling-day = Smiling Day
@@ -57,11 +56,10 @@ holiday-name-armistice-day = Armistice Day
 holiday-name-kindness-day = Kindness Day
 holiday-name-life-day = Life Day
 holiday-name-flowers-day = Flower's Day
-holiday-name-transgender-remembrance-day = Transgender Day of Remembrance
 holiday-name-saying-hello-day = Saying Hello Day
 holiday-name-thanksgiving = Thanksgiving in the United States
 holiday-name-sinterklaas = Sinterklaas
-holiday-name-human-rights-day = Human-Rights Day
+holiday-name-human-rights-day = Human-Rights Day, Fuck the Vox
 holiday-name-monkey-day = Monkey Day
 holiday-name-mayan-doomsday = Mayan Doomsday Anniversary
 holiday-name-christmas = Christmas
@@ -79,5 +77,6 @@ holiday-custom-friendship-day = Have a magical Friendship Day!
 holiday-custom-talk-like-a-pirate-day = Ye be talkin' like a pirate today or else ye'r walkin' tha plank, matey!
 holiday-custom-halloween = Have a spooky Halloween!
 holiday-custom-kindness-day = Go do some random acts of kindness for a stranger!
+holiday-custom-humanityfuckyeah = Gas the Vox! Space War Now!
 holiday-custom-christmas = Have a merry Christmas!
 holiday-custom-festive-season = Have a nice festive season!

Resources/Prototypes/CharacterItemGroups/Generic/neckGroup.yml

@@ -27,24 +27,6 @@
       id: LoadoutNeckScarfStripedZebra
     - type: loadout
       id: LoadoutNeckTieWhite
-    - type: loadout
-      id: LoadoutItemsPrideLGBTPin
-    - type: loadout
-      id: LoadoutItemsPrideAromanticPin
-    - type: loadout
-      id: LoadoutItemsPrideAsexualPin
-    - type: loadout
-      id: LoadoutItemsPrideBisexualPin
-    - type: loadout
-      id: LoadoutItemsPrideIntersexPin
-    - type: loadout
-      id: LoadoutItemsPrideLesbianPin
-    - type: loadout
-      id: LoadoutItemsPrideNonBinaryPin
-    - type: loadout
-      id: LoadoutItemsPridePansexualPin
-    - type: loadout
-      id: LoadoutItemsPrideTransPin
     - type: loadout
       id: LoadoutNeckBedsheetCosmos
     - type: loadout

Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml

@@ -1,9 +0,0 @@
-- type: cargoProduct
-  id: CrateVendingMachineRestockPride
-  icon:
-    sprite: Objects/Specific/Service/vending_machine_restock.rsi
-    state: base
-  product: CrateVendingMachineRestockPrideFilled
-  cost: 1100
-  category: Service
-  group: market

Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml

@@ -1,7 +0,0 @@
-- type: entity
-  id: CrateVendingMachineRestockPrideFilled
-  parent: CratePlastic
-  components:
-  - type: StorageFill
-    contents:
-      - id: VendingMachineRestockPride

Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml

@@ -7,19 +7,3 @@
   components:
   - type: Sprite
     sprite: DeltaV/Objects/Specific/Service/vending_machine_restock.rsi
-
-- type: entity
-  parent: BaseVendingMachineRestockDeltaV
-  id: VendingMachineRestockPride
-  name: Pride-O-Mat restock box
-  description: The station needs more plushie sharks and you know it.
-  components:
-  - type: VendingMachineRestock
-    canRestock:
-    - PrideDrobeInventory
-  - type: Sprite
-    layers:
-    - state: base
-    - state: green_bit
-      shader: unshaded
-    - state: refill_pride

Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml

@@ -1,30 +1,3 @@
-- type: entity
-  parent: VendingMachine
-  id: VendingMachinePride
-  name: Pride-O-Mat
-  description: A vending machine containing crimes.
-  components:
-  - type: VendingMachine
-    pack: PrideDrobeInventory
-    offState: off
-    brokenState: broken
-    normalState: normal-unshaded
-  - type: Advertise
-    pack: PrideDrobeAds
-  - type: SpeakOnUIClosed
-    pack: PrideDrobeGoodbyes
-  - type: Speech
-  - type: Sprite
-    sprite: DeltaV/Structures/Machines/VendingMachines/pride.rsi
-    layers:
-    - state: "off"
-      map: ["enum.VendingMachineVisualLayers.Base"]
-    - state: "off"
-      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
-      shader: unshaded
-    - state: panel
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
-
 - type: entity
   parent: VendingMachine
   id: VendingMachineCourierDrobe

Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml

@@ -135,15 +135,6 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/miner.rsi
 
-- type: entity
-  parent: ClothingNeckBase
-  id: ClothingNeckCloakTrans
-  name: vampire cloak
-  description: Worn by high ranking vampires of the transylvanian society of vampires.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/Cloaks/trans.rsi
-
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCloakGoliathCloak
@@ -200,75 +191,3 @@
   - type: TypingIndicatorClothing
     proto: alien
 
-- type: entity
-  parent: ClothingNeckBase
-  id: ClothingNeckCloakAce
-  name: pilot's cloak
-  description: Cloak awarded to Nanotrasen's finest space aces.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/Cloaks/ace.rsi
-
-- type: entity
-  parent: ClothingNeckBase
-  id: ClothingNeckCloakAro
-  name: werewolf cloak
-  description: This cloak lets others know you're a lone wolf.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/Cloaks/aro.rsi
-
-- type: entity
-  parent: ClothingNeckBase
-  id: ClothingNeckCloakBi
-  name: poison cloak
-  description: The purple color is a clear indicator you are poisonous.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/Cloaks/bi.rsi
-
-- type: entity
-  parent: ClothingNeckBase
-  id: ClothingNeckCloakIntersex
-  name: cyclops cloak
-  description: The circle on this cloak represents a cyclops' eye.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/Cloaks/intersex.rsi
-
-- type: entity
-  parent: ClothingNeckBase
-  id: ClothingNeckCloakLesbian
-  name: poet cloak
-  description: This cloak belonged to an ancient poet, you forgot which one.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/Cloaks/les.rsi
-
-- type: entity
-  parent: ClothingNeckBase
-  id: ClothingNeckCloakGay
-  name: multi-level marketing cloak
-  description: This cloak is highly sought after in the Nanotrasen Marketing Offices.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/Cloaks/gay.rsi
-
-- type: entity
-  parent: ClothingNeckBase
-  id: ClothingNeckCloakEnby
-  name: treasure hunter cloak
-  description: This cloak belonged to a greedy treasure hunter.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/Cloaks/enby.rsi
-
-- type: entity
-  parent: ClothingNeckBase
-  id: ClothingNeckCloakPan
-  name: chef's cloak
-  description: Meant to be worn alongside a frying pan.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/Cloaks/pan.rsi
-