From: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>
Date: Thu, 28 Dec 2023 16:54:09 +0000 (-0500)
Subject: remove unsafe presents from present tree. (#23118)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=89ccd6aaba743121c779604029f53c770e7805f8;p=space-station-14.git

remove unsafe presents from present tree. (#23118)
---

diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
index 2a448274db..791127170f 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
@@ -422,15 +422,12 @@
     spawnEntries:
       - id: PresentRandom
         orGroup: present
-      - id: PresentRandomUnsafe
-        prob: 0.35
-        orGroup: present
-      - id: PresentRandomInsane
-        prob: 0.20
-        orGroup: present
       - id: PresentRandomCash
         prob: 0.20
         orGroup: present
+      - id: PresentRandomAsh
+        prob: 0.05
+        orGroup: present
     receivedPopup: christmas-tree-got-gift
     deniedPopup: christmas-tree-no-gift
     requiredHoliday: FestiveSeason
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
index 2afbb86b03..cb72923e82 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -20,7 +20,7 @@
 - type: entity
   id: PresentRandomUnsafe
   parent: [PresentBase, BaseItem]
-  suffix: Filled Unsafe
+  suffix: Filled, any item
   components:
   - type: RandomGift
     wrapper: PresentTrash
@@ -35,7 +35,7 @@
 - type: entity
   id: PresentRandomInsane
   parent: PresentRandomUnsafe
-  suffix: Filled Insane
+  suffix: Filled, any entity
   components:
     - type: RandomGift
       insaneMode: true
@@ -356,9 +356,6 @@
         orGroup: GiftPool
       - id: BalloonSyn
         orGroup: GiftPool
-      - id: WeaponPulseCarbine
-        prob: .001
-        orGroup: GiftPool
       - id: RGBStaff
         orGroup: GiftPool
     sound: