Remove invalid mail types

DeltaV-Station · Sep 29, 2023 · 0d144d2 · 0d144d2
1 parent e9599a7
commit 0d144d2
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 49 deletions.
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail.yml
@@ -111,8 +111,8 @@
       prob: 0.10
     - id: BookGnominomicon
       prob: 0.2
-    - id: BookSalvageEpistemics1
-      prob: 0.025
+#    - id: BookSalvageEpistemics1
+#      prob: 0.025
 
 - type: entity
   noSpawn: true
@@ -318,17 +318,18 @@
     - id: UniformSchoolgirlRed
       orGroup: Color
 
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailCosplayWizard
-  suffix: cosplay-wizard
-  components:
-  - type: Mail
-    contents:
-    - id: ClothingOuterWizardFake
-    - id: ClothingHeadHatWizardFake
-    - id: ClothingShoesWizardFake
+#- type: entity
+#  noSpawn: true
+#  parent: BaseMail
+#  id: MailCosplayWizard
+#  suffix: cosplay-wizard
+#  components:
+#  - type: Mail
+#    contents:
+#    - id: ClothingOuterWizardFake
+#    - id: ClothingHeadHatWizardFake
+#    - id: ClothingShoesWizardFake
+# We dont have these?
 
 - type: entity
   noSpawn: true
@@ -592,14 +593,14 @@
       orGroup: Plushie
     - id: PlushieSnake
       orGroup: Plushie
-    - id: PlushieMoffRandom
+    - id: PlushieMothRandom
       orGroup: Plushie
-    - id: PlushieMoff
+    - id: PlushieMoth
       orGroup: Plushie
-    - id: PlushieMoffsician
+    - id: PlushieMothMusician
       prob: 0.5
       orGroup: Plushie
-    - id: PlushieMoffbar
+    - id: PlushieMothBartender
       prob: 0.5
       orGroup: Plushie
 

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_epistemology.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_epistemology.yml
@@ -1,12 +1,13 @@
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailEpistemologyBluespace
-  suffix: bluespace
-  components:
-  - type: Mail
-    contents:
-    - id: MaterialBluespace1
+#- type: entity
+#  noSpawn: true
+#  parent: BaseMail
+#  id: MailEpistemologyBluespace
+#  suffix: bluespace
+#  components:
+#  - type: Mail
+#    contents:
+#    - id: MaterialBluespace1
+# Awaiting bluespace to be implemented
 
 - type: entity
   noSpawn: true

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_medical.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_medical.yml
@@ -65,16 +65,17 @@
     contents:
     - id: SheetPlasma1
 
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailMedicalSpaceacillin
-  suffix: spaceacillin
-  components:
-  - type: Mail
-    contents:
-    - id: SyringeSpaceacillin
-      maxAmount: 3
+#- type: entity
+#  noSpawn: true
+#  parent: BaseMail
+#  id: MailMedicalSpaceacillin
+#  suffix: spaceacillin
+#  components:
+#  - type: Mail
+#    contents:
+#    - id: SyringeSpaceacillin
+#      maxAmount: 3
+# Awaiting diseases
 
 - type: entity
   noSpawn: true

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_security.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_security.yml
@@ -33,15 +33,16 @@
     - id: Handcuffs
       maxAmount: 2
 
-- type: entity
-  noSpawn: true
-  parent: BaseMail
-  id: MailSecuritySpaceLaw
-  suffix: spacelaw
-  components:
-  - type: Mail
-    contents:
-    - id: HyperlinkBookSpaceLaw
+#- type: entity
+#  noSpawn: true
+#  parent: BaseMail
+#  id: MailSecuritySpaceLaw
+#  suffix: spacelaw
+#  components:
+#  - type: Mail
+#    contents:
+#    - id: HyperlinkBookSpaceLaw
+# Will we ever readd hyperlinks books? Who knows!
 
 - type: entity
   noSpawn: true

diff --git a/Resources/Prototypes/Nyanotrasen/mailDeliveries.yml b/Resources/Prototypes/Nyanotrasen/mailDeliveries.yml
@@ -18,7 +18,7 @@
     MailCosplayMaid: 0.5
     MailCosplayNurse: 0.5
     MailCosplaySchoolgirl: 0.5
-    MailCosplayWizard: 0.5
+    #MailCosplayWizard: 0.5
     MailCrayon: 1
     MailFigurine: 1
     MailFishingCap: 0.5
@@ -55,7 +55,7 @@
       MailMedicalEmergencyPens: 3
       MailMedicalMedicinePills: 2
       MailMedicalSheetPlasma: 1
-      MailMedicalSpaceacillin: 1
+      # MailMedicalSpaceacillin: 1
       MailMedicalStabilizers: 2
     Engineering:
       MailAMEGuide: 1
@@ -67,10 +67,10 @@
       MailSecurityDonuts: 3
       MailSecurityFlashlight: 2
       MailSecurityNonlethalsKit: 2
-      MailSecuritySpaceLaw: 1
+      #MailSecuritySpaceLaw: 1
     Epistemology:
       MailBooks: 1
-      MailEpistemologyBluespace: 1
+      # MailEpistemologyBluespace: 1
       MailEpistemologyIngotGold: 2
       MailEpistemologyResearchDisk: 1
       MailEpistemologyTinfoilHat: 1