cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-12 16:37:19 +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 13:55:13 -04:00
committed by GitHub
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/modules/client/preference_setup/loadout/items/smoking.dm
+5 -2
View File
@@ -58,6 +58,7 @@
cigarettes["Royal Choice cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/nka
cigarettes["Eriuyushi Sunset cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/federation
cigarettes["Xaqixal Dyn Fields cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/dyn
cigarettes["Natural Vysokan Soothsayer oracle cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/oracle
gear_tweaks += new /datum/gear_tweak/path(cigarettes)
/datum/gear/smoking/chew
@@ -79,8 +80,8 @@
gear_tweaks += new /datum/gear_tweak/path(chews)
/datum/gear/smoking/leaves
display_name = "tobacco leaf selection"
description = "A selection of tobacco leaves."
display_name = "smokable leaf selection"
description = "A selection of smokable leaves."
path = /obj/item/storage/chewables/rollable
cost = 2
flags = GEAR_HAS_DESC_SELECTION
@@ -92,6 +93,8 @@
leaves["Agyre Lake tobacco leaves"] = /obj/item/storage/chewables/rollable
leaves["Excelsior Epsilon tobacco leaves"] = /obj/item/storage/chewables/rollable/fine
leaves["Golden Sol tobacco leaves"] = /obj/item/storage/chewables/rollable/nico
leaves["Vysokan Plains oracle leaves"] = /obj/item/storage/chewables/rollable/oracle
leaves["Velhalktai Marathon oracle leaves"] = /obj/item/storage/chewables/rollable/vedamor
gear_tweaks += new /datum/gear_tweak/path(leaves)
/datum/gear/smoking/pipe