Old Rollie Name Integration (#35544)

diff --git a/Resources/Prototypes/Datasets/Names/rollie.yml b/Resources/Prototypes/Datasets/Names/rollie.yml
index b758fb13ac32c637952c6d6c938ea85e2faf9304..34ab26386144fd813e53de3adaeb8fd488f112fe 100644 (file)
--- a/Resources/Prototypes/Datasets/Names/rollie.yml
+++ b/Resources/Prototypes/Datasets/Names/rollie.yml
@@ -4,7 +4,7 @@
   - "bifta"
   - "bifter"
   - "bird"
-  - "blunt"
+  #- "blunt" Change: Blunts already exist, no need to make them roll, god forbid we get a joint called a blunt
   - "bloint"
   - "boof"
   - "boofer"
@@ -22,7 +22,7 @@
   - "hootie"
   - "jay"
   - "jimmy"
-  - "joint"
+  #- "joint" Change: Joints already exist, no need to make them roll, same reason as above but backwards
   - "juju"
   - "jeebie weebie"
   - "number"

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml
index 9a0d96e89eaf2431bcd9007ef0a82efea6d18fc2..86a95e444b56f2b2b67b9294962f04f606fe4cf1 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml
@@ -28,7 +28,9 @@
         reagents:
           - ReagentId: THC
             Quantity: 20
-            
+  - type: RandomMetadata
+    nameSegments: [names_rollie]
+
 - type: entity
   id: JointRainbow
   parent: Joint
@@ -87,6 +89,8 @@
         reagents:
           - ReagentId: THC
             Quantity: 20
+  - type: RandomMetadata
+    nameSegments: [names_rollie]
 
 - type: entity
   id: BluntRainbow