]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Remove THC oil (#27889)
authorslarticodefast <161409025+slarticodefast@users.noreply.github.com>
Fri, 10 May 2024 23:56:48 +0000 (01:56 +0200)
committerGitHub <noreply@github.com>
Fri, 10 May 2024 23:56:48 +0000 (19:56 -0400)
remove THC oil

Resources/Locale/en-US/reagents/meta/narcotics.ftl
Resources/Locale/en-US/reagents/meta/physical-desc.ftl
Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
Resources/Prototypes/Reagents/narcotics.yml

index a7cffb7f6ba960ff076b3a42faf727fd2c13273e..d6da25950134c29d74eebe2d6e508fb4712e0a19 100644 (file)
@@ -13,9 +13,6 @@ reagent-desc-experimental-stimulants = A prototype version of the stimulant chem
 reagent-name-thc = THC
 reagent-desc-thc = The main psychoactive compound in cannabis.
 
-reagent-name-thc-oil = THC oil
-reagent-desc-thc-oil = Pure THC oil, extracted from the leaves of the cannabis plant. Much stronger than its natural form and can be used to numb chronic pain in patients.
-
 reagent-name-bananadine = bananadine
 reagent-desc-bananadine = A mild psychedelic that is found in small traces in banana peels.
 
index 355b76c2a49fc9abd2c79f8efbfcf71ec7b5b16a..61954e01eb50c699cb0f743fb062a0a1e5a551ef 100644 (file)
@@ -1,4 +1,3 @@
-reagent-physical-desc-skunky = skunky
 reagent-physical-desc-soapy = soapy
 reagent-physical-desc-ferrous = ferrous
 reagent-physical-desc-nothing = nothing
index aedfd262d809f6ee29219fc238da428932c33fdc..8bca49c4e5fedf0703bb2aef6594822c61ffb75b 100644 (file)
     - Desoxyephedrine
     - Ephedrine
     - THC
-    - THCOil
     - SpaceDrugs
     - Nocturine
     - MuteToxin
index 9b14fa2bc8927f30d8cdd5b9a4894cfee6c050c7..21d73104839c2949f9f15690faa54fa03c82bc9c 100644 (file)
         time: 16
         refresh: false
 
-- type: reagent
-  id: THCOil # deprecated in favor of THC, preserved here for forks
-  name: reagent-name-thc-oil
-  group: Narcotics
-  desc: reagent-desc-thc-oil
-  physicalDesc: reagent-physical-desc-skunky
-  flavor: bitter
-  flavorMinimum: 0.05
-  color: "#DAA520"
-  metabolisms:
-    Narcotic:
-      effects:
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
-        component: SeeingRainbows
-        type: Add
-        time: 16
-        refresh: false
-
 - type: reagent
   id: Nicotine
   name: reagent-name-nicotine