cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added new drugs from lore and otherwise (#16773)

Browse Source 
* Initial commit of new drugs

Start on caromeg and oracle

Further work on caromeg

Fix nicotine and caromeg

Begin populating map

Designer cocaine effects

Weaken heroin, Joy now causes genetic damage

Added an artificial alternative to morphine, tramarine, that can be used in its place.

Nerf new opioids, fix tramaline recipe

Added special mentholated adhomian cigarettes, for NKA cigarettes

General fixes

Fix recipe pathing

Add coca leaves, cocaine recipes, and coca drinks

Update Chemistry-Reagents-Medicine.dm

Null name for abstract drug class

Remove abstract_class from reagents (shouldn't be used there)

* Oracle sprites by Wezzy

* .

* Begin resolving issues from code review

* Remove all per-player data from drug singletons

* Resolve Arrow's code review

* Apply suggestions from code review

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

Update code/modules/hydroponics/seed_datums/smokables.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Removed coca plants from the standard garden and hydroponics vendors (they remain as contraband and in the xenobotany garden)

* Fix merge conflict errors caused by snack PR

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Co-authored-by: Cody Brittain <cbrittain10@live.com>
This commit is contained in:
Cody Brittain
2023-10-20 17:55:13 +00:00
committed by GitHub
co-authored by SleepyGemmy Cody Brittain
parent 38b107398d
commit 4e2b58f02a
43 changed files with 893 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/misc.dm
+21
View File
@@ -163,6 +163,13 @@
item_state = "Dpacket"
starts_with = list(/obj/item/clothing/mask/chewable/tobacco/fine = 6)
/obj/item/storage/chewables/oracle
name = "can of Natural Vysokan Fields chewing oracle"
desc = "A can of chewing oracle, advertising Vysoka's natural beauty. A warning box stating \"This chewing oracle is not healthier than tobacco alternatives\" appears to have been haphazardly placed on the can."
icon_state = "oracle_chew"
item_state = "Fpacket"
starts_with = list(/obj/item/clothing/mask/chewable/oracle = 6)
/obj/item/storage/box/fancy/chewables/tobacco/nico
name = "box of Nico-Tine gum"
desc = "A Sol-approved brand of nicotine gum. Cut out the middleman for your addiction fix."
@@ -223,3 +230,17 @@
starts_with = list(/obj/item/reagent_containers/food/snacks/grown/dried_tobacco/pure = 8)
icon_state = "roll_nico"
item_state = "Epacket"
/obj/item/storage/chewables/rollable/oracle
name = "box of Vysokan Plains oracle leaves"
desc = "This box gives a large list of potential sources for the oracle inside of it, reflecting the unstable and volatile state of Vysokan politics."
starts_with = list(/obj/item/reagent_containers/food/snacks/grown/dried_oracle = 8)
icon_state = "roll_oracle"
item_state = "Dpacket"
/obj/item/storage/chewables/rollable/vedamor
name = "box of Velhalktai Marathon oracle leaves"
desc = "Packaged by a major sponsor of the Velhalktai races, and exported by NanoTrasen, this box promises quality oracle grown directly in the city-state of Vedamor."
starts_with = list(/obj/item/reagent_containers/food/snacks/grown/dried_oracle/fine = 8)
icon_state = "roll_vedamor"
item_state = "Epacket"