Commit Graph

141 Commits

Author SHA1 Message Date
Crosarius
0af399e3f9 Moghresian Meat & Unathi Food Nutrition Improvement (#19135)
This PR creates a new subtype of meat, "moghresian meat", specific to
animals which are located in Uueoa-Esa.

It also adds "synthetic" blood to the biogenerator, for use in the many
recipes which require blood (I did this because it's actually impossible
to get blood from cows, chickens, etc - turns out you can't draw blood
frim simplemobs, and people have been either using their own blood, or
making monkey cubes and drawing blood from them, which is WEIRD.
Mechanically the "synthetic" blood is just generic blood. I have no idea
if vampires can abuse this, but it should be no different from them
making monkey cubes in the biogenerator and eating them, so... hopefully
that's ok?)

~I have also done a once-over on the reagent values of all the food in
the Unathi foods dm, and fixed the reagent value for them. Some foods
had far fewer reagents than their constituent ingredients, which
bothered me. I also fixed their flavours so you get nicer messages
instead of "some sort of protein"

I noticed that this food reagent issue is actually prevalent in ALL the
food .DMs. A good example of this is Black Eye Gumbo, which has no
reagents listed. It can be eaten in a single bite and tastes like
nothing, and cannot be ground. I think that some people have added foods
under the impression that the reagents of the ingredients are added by
the cooking process, when this doesn't actually seem to be the case. I
fixed this just for the Unathi foods, but I don't have the time to go
through them all.~

EDIT: Turns out the reagent thing was a red-herring caused by
adminspawning food. Fixed now!
2024-05-15 17:09:56 +00:00
tomixcomics
020acf3253 Foodsplosion (Adds many new food dishes and 1 new drink) (#19065)
Adds 14 new food dishes including
-pigs in a blanket
-alfajores
-grilled peppers
-meat stuffed peppers
-rice stuffed peppers
-peanut butter pita
-omelette pita
-paneer gadpathur
-konaqu
-schnitzel
-schnitzel pita
-cozmo cubes
-nakarka cheese
-nakarka burger

and 1 drink: ne'miik (which is vaurcan milk)

I suspect I mightve screwed something up while merging there are
supposed to be no changes to aurora.dmi so if anyone wants to help me
figure out how to undo that your help would be welcome!

---------

Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>
Co-authored-by: Sparky. <ben.polwart@gmail.com>
2024-05-05 14:16:21 +00:00
DreamySkrell
7d67044010 More muffins (#19038)
momev update


![image](https://github.com/Aurorastation/Aurora.3/assets/107256943/392b224f-1d47-4f61-85cb-77c2c94d33a1)

momev update

---------

Co-authored-by: DreamySkrell <>
2024-05-01 22:36:14 +00:00
Cody Brittain
9983fca311 Update SSOverlays (ported from Baystation) (#19051)
Our SSOverlays system is outdated, and is likely the cause of many of
the issues seen in #18895. It has also been linked to a massive server
performance decrease.

This brings an updated system from Baystation, hopefully with speed
increases.

Should be testmerged, ideally with #18895.

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2024-05-01 07:46:27 +00:00
Cody Brittain
c1d241594b Planes & Layers part 2: Plane Masters (#18749)
Part 2 of the PR series to bring /tg/'s and bay's plane masters to
Aurora, the lack of which is blocking several features we want.

This ports over the easier to understand Bay version of plane masters,
which is detailed in the relevant readme file in the code. Example
effect code for a warp effect is also in, which has been implemented for
gravity catapults.

Relies on #18741

---------

Signed-off-by: Matt Atlas <mattiathebest2000@hotmail.it>
Co-authored-by: Cody Brittain <cbrittain10@live.com>
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
2024-04-13 18:07:51 +00:00
Fluffy
5888de6ea0 Implemented SI prefixes (KILO, MEGA, GIGA, TERA etc.) (#18874)
Implemented SI prefixes (KILO, MEGA, GIGA, TERA etc.)
2024-04-12 22:22:14 +00:00
Fluffy
1b40dbce82 Updated the sound system (#18724)
* sdaf

* sdaf

* sdfa

* sadf

* sfda

* gfd

* reduce thrusters volume

* sdafsadsdaf

* sdfa

* Reduced some sound ranges and made some/more not ignore walls for loops

* health analyzers too

* ivdrip adjustment

* most tools now use play_tool_sound to have the sound played, reduced range for it
2024-03-25 20:40:36 +00:00
Matt Atlas
fec6dbe24f Adjusts the force of all items to be multiplied. (#18708)
* force balancing?

* force

* cl & maglight nerf

---------

Co-authored-by: DreamySkrell <>
Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-03-24 17:10:31 +00:00
Matt Atlas
57067892d8 Ports the weather system from Nebula. (#18706)
* part 1

* compiles?

* IT WORKS

* vis contents

* fixes

* umbrelloid

* umbrella 2

* dsasdd

* stuff

* lmao

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-03-24 14:05:00 +00:00
tomixcomics
0795be029e [BUGFIX] Corrects drink flavor, adds missing recipe (#18718)
* changes

* added changelog
2024-03-21 18:43:03 +00:00
juniper
16f24d9008 Coalition of Snackolonies II: Fetch Harder Edition (#18626)
* ship it joe

* yangechog

* hoargh

* it's a plastic bottle

* little things

* MEAT

* last bit

* vanilla isn't real

* maps in the vendor + minor additions

* this may fix the Issue

* do this later

* last-minute changes i noticed while i was at work

* my agonies

* aeiou

* keep trying...

* what will this break hmm

* i clench my fist and beat it

* matt's changes

* fixes feni + 2275
2024-03-17 21:56:49 +00:00
tomixcomics
fddefa054e Decrease food waste (Kitchens spawn with a few extra ingredients) (#18648)
* first commit

woo

* added changelog

* Update aurorastation.dme

* Update code/game/objects/random/misc.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>

* Update code/modules/reagents/reagent_containers/food/condiment.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>

* Update code/game/objects/random/misc.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>

* Update code/modules/reagents/reagent_containers/food/condiment.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>

---------

Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2024-03-17 21:55:12 +00:00
SleepyGemmy
688a7276cb Fixes the Bagel Recipe (#18662) 2024-03-17 21:54:15 +00:00
tomixcomics
a61b3d0f2a Eating in Aoyama (New foods, drinks and plants (and some ports!)) (#18605)
* so many theengs!

* Let's commit!

because I haven't in a while!

* final commit fo rnow

* added changelog

* Update TOMIXCOMICS-PR.yml

* ugh

i should've known it was a jinx to refer to a commit as 'final'. bleh.

* added new ramen dish to the ramen vending machine in PV

meant to do that before submitting but had issues with it.
2024-03-09 22:12:06 +00:00
Fluffy
9fc52575dd Refactored MouseDrop_T (#18549)
* sdafas

* sdaf
2024-02-29 21:58:23 +00:00
SleepyGemmy
5ccdcc94cb Changes the Chocolate Hazelnut Spread Paths to Lowercase (#18452)
* Changes the Chocolate Hazelnut Spread Paths to Lowercase

* Changelog Entry Type
2024-02-21 13:57:09 +00:00
tomixcomics
3850d6c52f New food as well as updating lasagnas and pancakes (#18412)
* added a bunch of things

* updated pancakes

* more updates

* updated bounty, made changelog
2024-02-17 20:06:30 +00:00
kyres1
8fd19de25c Nugget 4x Multiplication (#18409)
* mcdonalds

* thats not very mcnuggets of you
2024-02-17 00:07:18 +00:00
kyres1
0fd255a440 Point Verdant last minute bugfixes (chapter 1) (#18403)
* breaks your kneecaps cutely

* AGREGRHRH

* matt is a DUMB

* wait this was already fixed wtf

* buffet trays and the cave biome
2024-02-16 02:57:34 +00:00
Fluffy
9afe761db3 Some refactors, DMDoc and UT (#18365)
* dsfa

* accessories fix

* fixed "has been hit by" message with intent check

* sdfa
2024-02-12 15:32:23 +00:00
Matt Atlas
4423d03f2f Adds examine boxes. (#18370)
* Adds examine boxes.

* lint

* what kind of dreams did you dream?

* unlimited

* midgardsormr

* sdsd

* fixes

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-02-11 21:58:20 +00:00
tomixcomics
f05a932212 Adds new foods, fixed food bug and 1 food tweak (#18356)
* created a PR

with a whole buncha stuff :D

* Update recipes_breads.dm
2024-02-08 12:30:19 +00:00
Fluffy
ca6b04e1d7 Updated SSgarbage (#18173)
* pain

* sadfas

* sdfa

* sdfasf

* sfa

* sdf

* might the lord have mercy on our soul

* i cri everidai

* adeste fideles

* sdf

* where will this lead, what's coming next, from your inventions

* dear lord

* gjvhk

* i cri everidai

* fsgf

* sdfa

* sdaf

* hiuhi
2024-01-15 14:08:27 +00:00
tomixcomics
5e95fa42b6 New foods and drinks, tweaks/updates to old food. (#18140)
* first commit

fixed wooden platter sprite
fixed error in bounty phrasing
created recipe for hash browns
replaced flat dough in doner kebab recipe with a pita
made it so muffins are made in larger batches, and each muffin is less filling seperately
created 7 new kinds of milkshake
changed some incorect capitalization
made it so bread that's been eaten no longer creates leftover plates
updated ravioli code to fit with correct format
updated ravioli to be more filling.

* Roast chicken and River Loaf

created roast chicken and river loaf

* changleog

* corrected changelog

* updated food bug

* grammar update

updating capitalization

* updated bowl pickup ability

* code update
2024-01-09 17:11:55 +00:00
Matt Atlas
d5581d7261 Removes a comment from the code. (#18154)
Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-01-09 12:23:35 +00:00
Matt Atlas
0f70609936 Adds Konyanger tea leaves, teapots, and tea cups. (#18145)
* Adds Konyanger tea leaves, teapots, and tea cups.

* teatray to the glassware

* classic

* teapot correction

* updates

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-01-07 23:45:59 +00:00
tomixcomics
fec20152b8 New lore foods, Milkshakes, and a bugfix. (#18048)
* New foods, milkshakes, and a bugfix.

* changed syrup colors

* resolved weird merge conflict

* Update code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* made requested changes

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/reagents/Chemistry-Recipes.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/cooking/recipes/cultural/recipes_human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* made requested changes

* more corrections

* updating again because it didn't take last time

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
2023-12-27 16:40:09 +00:00
Matt Atlas
cadd19beac Ports the TG globals controller and converts globals. (#18057)
* 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>
2023-12-26 01:16:02 +00:00
Matt Atlas
23c0fd7b4f Autolathe and wires panel TGUI, autolathe queueing. (#17978)
* autolathe 1

* FUCK MY LIFE

* more fixes

* autolathe queueing

* cl

* garbage collection

* wire fixes

* some final tweaks

* on second thought this might be annoying

* fix that

* whoopsies

* that didn't work for shit

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-12-21 11:40:49 +00:00
tomixcomics
c234a555fd NTella food, drinks, and crepes (#17948)
* 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>
2023-12-19 11:46:06 +00:00
tomixcomics
3807930fe6 Adds Several New Foods (#17759)
* 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>
2023-12-01 12:13:46 +00:00
Acetrea
988f4d146a NT Muffin Sprite Fix (#17801)
* NT Muffin Sprite Fix

Fixes the NT muffin sprite issue

* Remove spaces from changelog

* Fix cargo bounty

* NT Muffin Sprite Fix

* mapfix
2023-11-27 23:19:37 +00:00
Cody Brittain
06601c9ec3 Split up and rename var/flags (#17794)
* Split up and rename `var/flags`

* Various fixes

* CL

* Don't rename Phoron Guard phoron preset

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-11-22 16:27:51 +00:00
Fluffy
c25c8b6a37 Last editorconfig fixup (#17782)
* one

* two

* three

* fsdsdf
2023-11-20 18:22:42 +00:00
Pirouette
38e137f3c3 Adds new foods, both IRL and lore (#17745)
* tomixfood

* Update recipes_human.dm

* Update recipes_human.dm

* fixes blue raspberry issue

* Update code/game/objects/items/trash.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-11-13 19:50:09 +00:00
SleepyGemmy
3359023925 Fixes the Pretzel Recipe (#17710) 2023-11-01 15:12:10 +00:00
Cody Brittain
4e2b58f02a Added new drugs from lore and otherwise (#16773)
* 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>
2023-10-20 17:55:13 +00:00
Matt Atlas
54dc8a0860 Adds TGUI say and TGUI input. (#17471)
* 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>
2023-10-11 23:26:59 +02:00
Fluffy
4538e2a7cc Fix indentations (#17481)
* cbt

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* fsadffsda sad

* sadfasd

* jhn

* dsfa

* saf

* safsad

* sda
2023-10-05 10:15:58 +00:00
Wowzewow (Wezzy)
086776cb83 New Cell Charger, Suit Storage, Drying Rack and Smartfridge Sprites (#17390)
* New Cell Charger, Suit Storage and Smartfridge Sprites

title, ported from /tg/

* Update wezzy-RandomBetterSprats.yml

* oops

* merge conflict

* konyang shit
2023-09-24 22:14:10 +00:00
Wowzewow (Wezzy)
faca6da739 The Food Sortening, Extra Pain-In-My-Ass Edition (#17393)
* 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
2023-09-24 22:13:15 +00:00
kyres1
f18d4128ad [WORK IN PROGRESS] Konyang and Point Verdant (#16714)
* 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>
2023-09-23 21:23:38 +02:00
Alberyk
57ad3201e0 Tajara loadout expansion: far from home edition (#17270)
* A lot of tajaran stuff

* Changelog

* moved this for better organization

* god fix

* Update code/modules/clothing/rings/xeno/tajara.dm

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* Flame source

* imrpoper

* passport

* matt fixes

* Fixes conflict

* fixes

* kitchen

---------

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
2023-09-21 10:28:15 +00:00
Wowzewow (Wezzy)
1b51600ca6 Kitchen Resprites (#17311)
* Kitchen Resprites

* for ata

* Update code/modules/cooking/machinery/cooking_machines/container.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/cooking/machinery/cooking_machines/container.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/cooking/machinery/cooking_machines/container.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/cooking/machinery/cooking_machines/container.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* admiral ackbar cereal

* walter j hartwell

* for real?

* hank schrader

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-09-19 09:58:22 +00:00
Cody Brittain
ce5ac79e3c Split examine verb and function, and improve it (#17251)
* Split examine verb and function, and include adjacency and distance checking in examine function

* Fix various issues

* Update code/modules/mob/examinations.dm

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

* Add required define vars

* Update code/game/objects/items/stacks/wrap.dm

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

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-09-09 08:07:36 +00:00
Wowzewow (Wezzy)
cc8eab09ef Reagent Containers : The 3/4thening & Contained Spritening (and other related food things) (#17231)
* food and drink

* sabrage

* kanpai and blasted on grain alcohol

* beakers

* Update code/modules/reagents/reagent_containers/food/cans.dm

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

* Update code/modules/reagents/reagent_containers/food/cans.dm

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

* Update code/modules/reagents/reagent_containers/food/cans.dm

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

* Update code/modules/reagents/reagent_containers/food/cans.dm

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

* Update code/modules/reagents/reagent_containers/food/cans.dm

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

* Update code/modules/reagents/reagent_containers/food/drinks/bottle.dm

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

* Update code/modules/reagents/reagent_containers/food/drinks/bottle.dm

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

* changelog

* the contained sprite-ening....

* deletes old file

* teapot

* aaaaahhhh

* AAAGH INHANDS

* volume = 30

* fixes invalid icon state

* is this really that fucking esoteric

* Revert "is this really that fucking esoteric"

This reverts commit 5b238c7821.

* this should fix it maybe

* fixes 2

* the simple solution

* skibidi toilet

* god dammit

* jyalra

* redundancy

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-09-06 18:54:20 +00:00
Ramke
c16b98a568 the meal (#17014) 2023-08-07 10:12:28 +00:00
juniper
58f14b2485 Pizza Tweaks (#16806)
* yangechog

* custom pizzas too! just had to finish that one

* gemfix

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

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-07-24 21:17:51 +00:00
Doxxmedearly
6f2916df29 Smartfridge atmos blocking fix (#16856) 2023-07-24 11:13:28 +00:00
DreamySkrell
2a64e17d6a Abandoned industrial station (#16677)
* init

* map work

* mappin

* map

* random/tool(box)/icon_state fix

* mappin

* a

* b

* aa

* trashbin filled

* boozeomat/abandoned

* foodheater/abandoned

* areas

* map

* areas etc

* a

* a

* a

* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* light

* a

* b

* a?

* aaaaaaaa

* changelog

* broken light, off lamp

* madness

* a

* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* a

* uhhh

* I am becoming insane

* hangars, how do they work?

* lattices

* light/spot/weak begone

* game note

---------

Co-authored-by: DreamySkrell <>
2023-07-23 22:40:00 +00:00