* SDQL2 update
* fix that verb
* cl
* fix that
* toworld
* this is pointless
* update info
* siiiiick..
* vv edit update
* fix that
* fix editing vars
* fix VV
* Port the /TG/ globals controller.
* part 1
* part 2
* oops
* part 3
* Hollow Purple
* sadas
* bsbsdb
* muda na agaki ta
* ids 1-15
* 16-31
* 41-75
* bring me back to how things used to be before i lost it all
* the strength of mayhem
* final touches
* cl
* protect some vars
* update sdql2 to use glob
* stuff?
* forgot that is not defined there
* whoops
* observ
* but it never gets better
* a
---------
Co-authored-by: Matt Atlas <liermattia@gmail.com>
* Notella food, drinks, and crepes
Added some foods and drinks using notella. Made several different kinds of crepes.
* added changelog
changelog wooo
* fixed merge conflicts
* Update code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
* Update code/modules/reagents/reagent_containers/food/snacks/confections.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
* Update code/modules/reagents/reagent_containers/food/snacks/pastries.dm
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
* changed all the notella names to NTella
---------
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
* the pr!
* changelog, overdose fiddling
* more overdose fiddling. overdose now kills.
* overdose hello??
* overdose is fine
* associative list? dmdocs?? it still works
* mayhap... you wanted... a space??/
* I... capitalize....?
* dmdoc part final?
* broke game while working on update, halp
thanks tech support
* Update code/modules/reagents/reagent_containers/food/snacks/soup.dm
Co-authored-by: Pirouette <57296132+listerla@users.noreply.github.com>
* Added more foods, still WIP
* updating things to see where the bgus are coming from
triolade, palfooz and cake pops are lal broken and idk why yet ._. someone said is hould commit changes and see what the checks say.
* trying to fix triolade and palfouz
* code giving trouble
* finally fixed the issues! woo!
* Got almost everything done and working!
only pitas are left :)
* Final update!
-Added a whole lot of recipes
-Fixed a whole lot of bugs
-Fixed V'krexi wraps from a previous update
-Updated some icons
-Let's submit this thing!
* Adding changelog
Woo, changelog!
* Update Tomixcomics-PR-17759.yml
Whoops, missed a typo.
* trying to solve issues
* fixed bug that was causing runtime errors when recipes were made incorrectly. PR should be good to go now.
* Update code/game/objects/items/trash.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/game/objects/items/weapons/storage/fancy.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/cooking/recipes/cultural/recipes_human.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/reagents/reagent_containers/food/sandwich.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/reagents/reagent_containers/food/snacks/cultural/vaurca.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* small fixes
deleted folder that wasn't supposed to be included (still no clue why it was there lol) and deleted unnecessary annotation
---------
Co-authored-by: Pirouette <57296132+listerla@users.noreply.github.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* 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
