From: DieselMohawk <173439801+DieselMohawk@users.noreply.github.com>
Date: Wed, 26 Feb 2025 23:37:31 +0000 (-0600)
Subject: Old Rollie Name Integration (#35544)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=7bd98b90754b38f745274d7657d735805ced2d84;p=space-station-14.git

Old Rollie Name Integration (#35544)
---

diff --git a/Resources/Prototypes/Datasets/Names/rollie.yml b/Resources/Prototypes/Datasets/Names/rollie.yml
index b758fb13ac..34ab263861 100644
--- 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 9a0d96e89e..86a95e444b 100644
--- 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