Commit Graph

2087 Commits

Author SHA1 Message Date
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
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)
d469e93fc3 3/4 reagent container sprite and cafe tweaks and fixes (#17259) 2023-09-07 14:49:00 +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
Fluffy
da23de6117 Metabolism qdel cleanup (#17206)
* Atomization

* sdfas

* sdfa

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-09-02 10:15:35 +00:00
Geeves
1ab598e051 Combat QoL (#17119)
* Combat QoL

* stuff

* Update html/changelogs/geeves-combat_qol.yml

---------

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
2023-08-24 19:30:07 +00:00
naut
74a347b53d More resprites (Aug 2023) (#17076)
* 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
2023-08-21 12:50:13 +00:00
Sparky
8ed506f1dc Chemistry Dispenser Eject Fix. (#17083)
Fixes #17078.
2023-08-15 00:31:39 +00:00
naut
13de5c7cba Adds alt-click removal to chemistry machines (#17052)
* Alt Click Eject

* code tweaks

* changelog

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

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

* Apply suggestions from code review

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

* adjacency check

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-08-14 15:50:13 +00:00
Ramke
c16b98a568 the meal (#17014) 2023-08-07 10:12:28 +00:00
Pirouette
f9b94fd4a8 typo fixes (#17019) 2023-08-07 10:12:18 +00:00
naut
fa94e54788 Adds Cytophenolate, a new immunosuppressant (#16958)
* Immunosuppressant

* chagnelgo

* slows metabolism down to make prescription meds not overly tedious

* CL update

* Update code/modules/organs/organ.dm

---------

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
2023-08-04 14:43:42 +00:00
Doxxmedearly
c0bff2b352 Potassium Chloride/Chlorophoride Adjustments (#16938)
* Potassium Chloride/Chlorophoride Adjustments

* Update code/modules/organs/internal/heart.dm

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

---------

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
2023-08-03 22:51:31 +00:00
DreamySkrell
cc41bb76fc Idris cafe (#16884)
* freezer, teal decals

* mappin

* a

* cafesign

* a

* coffeemenu

* pumpkinspice

* coffeemenu

* pspice in condi box

* mapping

* a

* a

* a

* takeaway cup

* chocolate syrup

* mappp

* table

* syrup icon

* syrup reagentfillings icon

* takeaway cup volume

* syrup bottles

* freez

* condiment box

* map

* c

* a

* firealarm

* oops

* Update DreamySkrell-idris-cafe-0.yml

* post merge fix?

---------

Co-authored-by: DreamySkrell <>
2023-07-30 18:31:18 +00:00
Fluffy
7912e31bcb ChemMaster UI tweaks (#16733)
* change+changelog

* amazin'

* bruhndle

* move defines
2023-07-24 21:57:08 +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
Geeves
aefc19a9c6 Improvised Explosive Buff (#16795) 2023-07-23 18:24:22 +00:00
juniper
d01dcd5e10 yangechog (#16842) 2023-07-23 16:56:17 +00:00
juniper
1b6da7c6c2 yangechog (#16813) 2023-07-23 12:44:01 +00:00
juniper
12760c68a0 Dominia Content Update I: The Pax Liturgica (#16737)
* 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
2023-07-21 19:33:10 +00:00
Geeves
6fdcf4c897 Hummus Dip Fix (#16796) 2023-07-20 20:33:51 +00:00
Doxxmedearly
3c18ebe255 Fixes chugging message (#16745) 2023-07-17 12:08:15 +00:00
Fluffy
63f3f89269 Chemmaster TGUI (#16662)
* minimum viable product

* the E in TGUI stands for Enjoyment

* sdaf

* what the boss asked
2023-07-12 10:41:01 +00:00
WhatsUpBrotendo
68e3a9813e More Skrell food and drink (#16656)
* 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.
2023-07-11 01:51:09 +00:00
Ramke
6e4e7fd155 pill (#16663) 2023-07-10 01:01:42 +00:00
Werner
3742231bc2 Major UT Overhaul (#16544)
* 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>
2023-06-27 16:44:16 +02:00
Fluffy
5e1332d60f OpenDream linting (#16468)
* 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...
2023-06-26 17:05:38 +02:00
Matt Atlas
025b6e66d5 Fixes most tgui bugs (#16539)
* 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>
2023-06-26 15:36:11 +02:00
Matt Atlas
31956c7eb0 Rock the UI Away - Removes VueUI and adds TGUI (#16509)
* tgui the beginning

* binaries and the like

* Bring in the last of it

* Example radio UI

* delete example

* NTOS Main Menu, start on manifest, tgui states

* tasks.json

* gunnery ui pt 1

* okay

* fix everything

* scss update

* oops

* manifest gigablast

* downloader part 1

* download prt 2

* NTOSDownloader final

* mfw committing to_worlds

* gunnery console pt2

* i cooked

* targeting (finished)

* one vueui down

* voting ui almost done

* MY MIND FEELS LIKE AN ARCH ENEMYYYY

* voting ui down

* photocopier

* ntos config + download fixes

* photocopier 2

* refactor define

* NTOS client manager + fixes

* fax machine final (it also uses toner now)

* marching forwards... left behind...

* ntnrc part 1

* canister

* add quotes

* portable pumps pt1 + more backgrounds

* oops

* finish the portable pump

* freezers

so I'll keep on pushing forward... you haven't seen the last of me... oooooooh...

* doors ui pt1

* finish doors UI (forgive me wildkins it's a bit of shitcode)

* vitals monitor, make things use labeled lists, new backgrounds

* mais j'envoyé aucun mayday...

* maglock pt1

* pour ça je me suis perdu...

* infrared

* fix that

* prox sensor pt1

* prox sensor

* signaler (this was actually pretty hard)

* atmos control pt1

* atmos control pt1.1

* atmos pt 2

* fuel injector

* multitool UI

* jammer

* list viewer

* APC

* portgen

* targeting console updates + SMES ui

* new themes, shield generator

* supermatter

* Add ore detector and (shitty) NTNet Relay

* orderterminal pt1

* orderterminal pt2

* smartfridge

* Add (air-)tank GUI update ore detector size

* Adds Transfer Valves

* Add AtmoScrubber

* analyzer pt1

* weapons analyzer pt2

* bodyscanner pt1

* bodyscanner pt2

* fix this shitcode

* seed storage

* appearance changer

* appearance changer final

* sleeper pt1

* sleeper

* gps

* vehicles

* chem dispenser

* lily request

* holopad

* tgui modules pt1

* ppanel

* damage menu

* fixes

* im here too now

* follow menu, search bars

* quikpay

* quikpay fixes

* circuit printer

* ppanel

* ppanel updates

* pai

* turret controls (i want to kill myself)

* tweak

* remove the boardgame

* guntracker

* implant tracker

* penal mechs

come close to me, come close to me

* chem codex

* pai radio

* doorjack

* pai directives

* signaler removal, sensors

* ghost spawner

* spawnpoint

* fixes

* teleporter

* one more to the chopping block

* account database

* remove divider

* scanner, atmos

* latejoin ui pt1

* latejoin

* records pt1

* RECORDS UI DONE

* delete interpreter & records

* CHAT FUCKING CLIENT

* data updates

* fix some things

* final UI, log

* basic nanoui fix

* antag panel

* remove vueui

* atm update

* vending update

* warrants, cameras

* ntmonitor

* time comes for all

* preserve this legacy

* bring that back (oops)

* rcon, ui auto update for computer UIs, remove rcon computers

* alarm monitoring (a bit broke and also todo: add custom alarm monitoring programs to a few consoles)

* A LIKE SUPREME

* a

* power monitor

* lights on

* fuck this code, fuck nanoui modules, and fuck nanoui

* LEAVE IT OH SO FAR BEHIND

* fix alarm monitoring for synths

* I SAW IN YOU WHAT LIFE WAS MISSING

* comms console

* idcard and record updates

* turn the light on

* arcade

* pt2

* news browser

* static

* crusher

* f

* COULD I JUST SLEIGH THE GOLD FROM THE BALLS? I'M SO FRUSTRATED OH COULD YOU TELL? IF I HEAR ONE MORE VUEUI OR ONE NANOUI I'M GONNA LOSE IT SO LET ME GOOOOOOOOOOOOOOOOO

* codeowners & suit sensors

* html ui style removal

* make lint happy

* resist and disorder

* i slowly get up and turn off the noise, already fed up...

* pleaseeeeeeeeeeeeeee

* THE CREDIT LARP IS NECESSARY

* i hold the keys

* RISE UP

* fix that?

* harry's suggestions xoxo

* runtime fix pt2

* You are the only thing that I still care about

* adds build workflow

* Update update_tgui.yml

* adds some needed steps

* ATM

* misc fixes and tweaks

* fixes 2

* make newscasters usable and fix use power on freezers

* turret control is clearer

---------

Co-authored-by: John Wildkins <john.wildkins@gmail.com>
Co-authored-by: Matt Atlas <liermattia@gmail.com>
Co-authored-by: harryob <55142896+harryob@users.noreply.github.com>
Co-authored-by: Werner <Arrow768@users.noreply.github.com>
Co-authored-by: Geeves <ggrobler447@gmail.com>
Co-authored-by: harryob <me@harryob.live>
2023-06-25 19:03:33 +02:00
senorsapo
6ef56f3c71 max payne 3 (#16502)
* cocaina

* fix init error

* inhales
2023-06-24 09:31:42 +00:00
Llywelwyn
2f755aeafe San Colette zippo, and San Colette + Europa coffee cups (#16442)
* san colette coffee cup

* europa coffee cup

* san colette zippo + typo

+ cl

* oops forgot to stage this in last commit

* zippo inhands

* right inhands were out by a pixel

* as prev

* okay man whatever

* tiny change to extended desc of lighter

san colette aren't an independent state, just got recognised as a sub-polity
2023-06-10 12:34:10 +00:00
Pirouette
4493f33894 digusting -> disgusting (#16426)
* digusting -> disgusting

* Update html/changelogs/digusting.yml

Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>

---------

Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
2023-06-02 12:40:49 +00:00
Matt Atlas
a1bddc3920 Removes the brainburger. (#16336)
* Removes the brainburger.

* remove the sprite

* this time for real

* a

* d

* it would end like this

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-05-22 10:35:21 +00:00
Llywelwyn
7aef5a3f6d Ejecting beakers from a grinder as a mob without hands no longer deletes the beaker (#16373)
* cyborgs dont eat beakers

* updates cl

* rename cl
2023-05-20 15:21:10 +00:00
Pirouette
080b88d294 Updated drink descriptions to not reference old names (#16355) 2023-05-20 15:18:37 +00:00
Pirouette
f1f29bbc4a Made curry available in lunchboxes (#16356) 2023-05-19 19:14:39 +00:00
Matt Atlas
5a9a7a1b44 Chemistry grinders now eject beakers into your hands. (#16349)
Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-05-18 17:15:08 +00:00
Geeves
69a3cc7c49 Food Stuff (#16333)
* Food Stuff

* the aussies are ruining my life again
2023-05-17 11:52:32 +00:00
smellie
f237ea8309 Antag Dirty Bombs & Bodyhorror Parasites (#16317)
* dirty bombs & bodyhorror

* clean up + extra flavour

CE_ANTIEMETIC taken into account in the delayed_vomit() proc. doesn't need to subtract from CE_EMETIC anymore.

* desc. fix, TC tweak, syringe gun kit

* dirty bomb tweaks

radiation remains for as long as advertised (~8mins in an open space)
it also actually leaves behind the green goo now.
2023-05-16 00:34:10 +00:00
RustingWithYou
5799493c24 Unathi Plants (#16321)
* lizard plants

* lizard meals

* seeds in vendors

* changelog
2023-05-13 08:11:45 +00:00
harryob
578bae6f6f no relative pathing (#16234)
* the voices win in the end

* cleanup

* changelog

* secure.dm hates me

* make_exact_fit() in initialize instead of whatever was happening before
2023-04-30 21:10:13 +00:00
Wildkins
c8d4ef3b97 Speeds up init by ignoring contrib guidelines (#16217) 2023-04-19 20:57:56 +00:00
Matt Atlas
fee7deabd7 Fixes a lot of bugs. (#16187)
* Fixes a lot of bugs.

* fix more shit

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-04-10 17:29:16 +00:00
Matt Atlas
ab5d39db19 Ports SStyping from Nebula. (#16169)
* Ports SStyping from Nebula.

* the spook

* a

* fix

* bring the fanfare to its knees

* add a speech bubble type pref

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-04-10 00:08:48 +00:00
Sniblet
2209bb51de Many minor rewrites and spellchecks for accent descs (#16093)
* the pr

* Update sniblet-our.yml

* more of the same

ok lets just not even mention that pluto is in the sol system we don't have actual aliens playing this game we all know

* in adhomai

stepping a bit out of the confines of accents, just some more grammar checks while im at it

* Update code/modules/background/accent/human.dm

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

* Update code/modules/background/accent/human.dm

Co-authored-by: Llywelwyn <82828093+Llywelwyn@users.noreply.github.com>

* Update code/modules/background/accent/diona.dm

Co-authored-by: Llywelwyn <82828093+Llywelwyn@users.noreply.github.com>

* Update code/modules/background/accent/diona.dm

Co-authored-by: Llywelwyn <82828093+Llywelwyn@users.noreply.github.com>

* Update code/modules/background/accent/skrell.dm

Co-authored-by: Llywelwyn <82828093+Llywelwyn@users.noreply.github.com>

* Update code/modules/background/accent/diona.dm

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

* Update human.dm

who am i to tell you that these are readability downgrades

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: Llywelwyn <82828093+Llywelwyn@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-04-02 04:08:37 +00:00
Alberyk
e020c30033 Revives: Plates, Bowls and More Plates (#16085)
* kitchen stuff

* fucking hell just use tabs

* suffering goes on

* oh the misery

* map stuff

* aaaugh

* no more

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

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

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

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/trays.dm

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

* Update code/modules/cooking/trays.dm

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

* request

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

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* horizon fix

* horizon fix

* things

* Fixes

* icon update

* UNfucks stuff

* oh the misery

* jesus above

* stop using spaces

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-03-28 19:00:57 +00:00
Llywelwyn
e17a924751 Skrell recreational additions: 2 brands of cigarettes, 2 brands of chewing tobacco, wulumunusha cigarettes (#16091)
* initial commit with placeholders

- adds wulumunusha cigarette variant
- adds federation (tobacco) and traverse (wulu) cigarette packets w/ placeholder names and description

* initial fixes + changes for skrell team

- fixes sprite names
- removes the initial_affect from wulu extract; it's slow-acting, there should be no instantaneously noticeable effect
- traverse cigarettes no longer contain wulu, and instead are now mentholated with dyn
- traverse cigarettes are now added to vendors
- separate wulu cigarette added as a placeholder pending lore decision

* chewing tobacco and brand names

- brand names
- regular and menthol (dyn) chewables added
- added to loadout/vendors
- sprite changes

* descriptions + flavours

- added descriptions given by skrell team
- changed contents to give proper flavour messages

* cl, and wulu flavour description

- adds cl
- changes wulu flavour desc
- restricts diona from selecting the wulu pouch

* fixes

- adds wulu cigarette description

* updates packet descriptions

- short and wide

* pedantic description change

the old description bothered me

* adverbs of frequency go before the verb

* Update code/game/objects/items/weapons/cigs_lighters.dm

erroneous comma

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

* ash-tray to ashtray on all the descriptions whilst we're here

and wulu desc changed by brotendo's request

* Typo Fix

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-03-28 12:40:42 +00:00
Llywelwyn
73ab7640e2 Replaces mentions of the genophage and the Jargon Federation with their superseded names (#16072)
* genophage to X'Lu'oa

- replaces all mention of 'genophage' with 'X'Lu'oa'

* jargon to Nralakk

- replaces all remaining mentions of 'Jargon Federation' with 'Nralakk Federation'
2023-03-23 13:58:12 +00:00