* 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>
* Coffee
* Rename cafe latte sprite
* Forgot a few things, woops
* Last time I need to change cafe to caffe
* There was apparently a call for cafe latte here
* Wrong changelog location
* Revert "Wrong changelog location"
This reverts commit 4294b4ca2b.
* Adds steamed milk, changes the recipes again, roast coffee beans
* i alone am the honoured one
* THROUGHOUT HEAVEN AND EARTH I ALONE AM THE HONOURED ONE
* hollow point
* nanana
* ssss
* tgsay final touches
* stuff
* tgui inputs
* help
* carpal tunnel syndrome
* ffff
* again and again and again and again
* hehehehe
* dsada
* readd sanitize
* whoops
* dsad
* nah fuck that
* sd
* fix
* ow
* remove prefs for testmerging
* oops
* oops 2
* fix that
* f
---------
Co-authored-by: Matt Atlas <liermattia@gmail.com>
* Refactored do_after to use a flag-based system for options
* More flags
* Ditto
* Use the HAS_FLAG macro
* do_after pass
* Fix burning paper code
* Resolve issues from Fluffy's code reviews
* .
* The Food Sortening, Extra Pain-In-My-Ass Edition
Sorts all food sprites and cuts down the MONOLITH snacks.dm and food.dmi. This was an absolute pain in my ass. No front-facing changes.
Planning to add more shit down the line. Makes everyone's lives easier.
* changelol
* finally
* inhands
* merge conflict
* this really "ticked" me off HAHAHAHAHS
* fixes
* make megalinter happy
* starting point verdant
* major progress
* PAIN
* test
* zlevels AAGHHH OH NO
* im scream
* kawnyang
* dam thats good
* Biff Largehuge
* Look Gordon, ropes!
* wawagh
* rgrhgrhrgrh
* Gordon, you're alive! Thank God for that hazard suit.
* help
* frownie face
* wegh
* Gordon! Get away from the beams!
* Good morning, Gordon.
* Signs
* fix multiple proc definition
* initial ambience
* gay rain
* beach and some pebbles literally
* fixing conflicts aUGH
* generation
* guh?
* sewers and beach additions
* maping
* map
* womp womp
* landing zone
* fixing missing shit
* buddha
* ass
* major map updates
* implemented key doors, fixed baloon alert and tasks
* mineral color, adds ozone layer
* real fake walls
* vending subtypes for the regional market
* mooooar
* minimart pt 1
* haneunim skybox
* station mapping progress
* minimart and roboclinic
* offices progress
* bar work
* size change, some polishing of the office + police station
* map size update. Also a fuckton
* tunnels
* more work
* Why doesnt the map initialize
* broke shit
* fixing point verdant spawning, also ocean landing zone
* finishing some buildings
* mapping, village, not finished
* village, main road
* village stuff
* village stuff
* village stuff
* village stuff
* anchoring
* village stuff
* random space tiles fix
* random space tiles fix
* bin fixes
* missing initialize hint on new floors
* fix open space on basement level
* idk
* missing initialize hint
* tests again please
* tests rerun please
* oven/small be gone
* remove shuttle landmarks idk
* bad stairs fix maybe
* fix missing open space above stairs
* tests rerun please
* CircularRandomTurfAround fix
* spaces to tabs
---------
Co-authored-by: atteria <tarkona@protonmail.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com>
* New chem cartridges
* IV changes
* more resprites
* Auto stash before merge of "resprites2" and "origin/master"
* Auto stash before merge of "resprites2" and "origin/master"
* new tanks and cash
* removes tripping
* credit chip sound change
* wristbound resprite
* changelog
* changelog2
* deconfliction
* agh
* if you can read this shut up about it
* please
* please?
* fine. i'll do it myself
* Revert "fine. i'll do it myself"
This reverts commit 9682843336.
* please please
* i thought computers were supposed to be smart
* finishing touches
* it's never really the last change
* fixes missing witchfinder book
* yangechog
* edictjustments
* fixes seed packets
fjylozyn and wulumunusha seed packets should now exist
* skrell seed pack sprites
* skrell plant updates
* adds jylara to the snack machine
* skrell alcohol
* skrell drinks
* skrell food
* food sprites
* recipes
* drink sprites
* empty sprites
* reagents
* (some) skrell food options for lunchboxes
* changelog
* credit where credit's due
* haha oopsie! :3
rstweak doesn't exist
* Update drinks.dm
I made a trash item then realised I don't need a trash item, but forgot to delete the related code.
* Removes old UT definition files (drone/travis)
* Adds concurrency definitions to the workflows
* Changes our workflows to be more in line with what /tg does
* Adds a workflow to build/commit TGUI
* Adds a workflow to build/commit changelogs
Add python version to dependencies.sh
Fix dme errors
Removes a bunch of not included files
Cache Opendream and add directory to check_grep.py
Co-authored-by: Werner <Arrow768@users.noreply.github.com>
* I wanna set the universe on fire
* dfsaaf
* setup
* dir issue?
* dsf
* Perhaps the script
* saf
* cry
* pain
* sdfas
* Try reintroduction of tag-matcher
* Failed
* Tries to suppress dotnet compile warnings
* Like this maybe?
* woopsie
* Damn pathings
* Hate
* Pragmas
* unlint?
* Maybe?
* GDI
* Redundant ifdef removed and changelog
* Did I forgot the tag matcher, or it was still broken?
* Yea no that script is still broken
* Removed tag-matcher as requested
* *sigh*
* test
* bro what?
* hope
* just fixing the input
* Let's see if we catch it...
* Fixes most tgui bugs
* the soul longs for oblivion
* skin fix
* hardsuit fix
* b
* the final fixes (for now)
* bb
* fix keys
* cl
* fuck off
* i'm alone i'm alone i'm alone
* the heart's whisper
* fffss
* je cherche la vérité tout en l'évitant
---------
Co-authored-by: Matt Atlas <liermattia@gmail.com>