35 Commits

Author SHA1 Message Date
Greenjoe12345 d6653ee3aa Tajaran tea and drug expansion (#21651)
Adds two tajaran teas to the game, Messa's Tear and ras'nif. These can
be found in the loadout and the bar, as well as random warehouse spawns.
Adds solar salve, a legal herbal substance from Adhomai, found in the
loadout and warehouse spawns.
Also performs some tweaks to the Konyang teas in order to make brewing
teas with them easier.

---------

Signed-off-by: Greenjoe12345 <33647525+Greenjoe12345@users.noreply.github.com>
2026-01-28 06:43:44 +00:00
Fluffy a3a4d46fa7 Hitby refactor (#19624)
Refactored hitby to be in line with TG's version.
Refactored item weight defines to a more clear naming scheme, also in
line with TG's version.
Refactored how the movement bumps are handled, ported signals to handle
them, in preparation for the movement update.
Fixed disposal hit bouncing the hitting atom on the wall.
Items do not push other items anymore if they are tiny.
2024-07-28 20:52:08 +00:00
Crosarius 3120d2dda4 Chewing Koko (#19163)
Adds chewing koko, a chewable form of koko reeds available from smoking
vendors, and in the loadout.


![image](https://github.com/Aurorastation/Aurora.3/assets/30341877/ebddfe43-373b-4c37-9935-217e93fab710)
2024-05-19 16:25:28 +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 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
Cody Brittain 2d40e893e0 Assorted oracle fixes (#17645)
Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-10-21 11:32:27 +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
Wowzewow (Wezzy) 9c69a6e884 Sprite and Bug Fixes Again Again (#17477)
* Sprite and Bug Fixes Again Again

Fixes #17465
Fixes #17462
Fixes #17456
Fixes #17450
Fixes #17458
Fixes #17422

* changelog
2023-09-29 14:01:43 +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
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
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
Matt Atlas 31c73ead85 Ports the radiation subsystem and cleans up damage flags. (#15715) 2023-02-07 13:22:47 +01:00
Matt Atlas dd482c63af Update the codebase to 515. (#15553)
* Update the codebase to 515.

* edit that

* WHOOPS

* maor

* maybe works

* libcall and shit

* do that too

* remove that

* auxtools isnt updated so get rid of it

* actually remove auxtools lol

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-01-23 21:21:37 +01:00
Fluffy 04d89f212a Singletons + refactor of /datum/observ + refactor of /decl/ into /singleton/ (#15519) 2023-01-10 19:22:14 +01:00
Matt Atlas b1869884c1 Revert "Singletons + refactor of /datum/observ (#15487)" (#15515) 2023-01-05 19:21:22 +01:00
Fluffy 0ddcf0817a Singletons + refactor of /datum/observ (#15487) 2023-01-05 18:41:40 +01:00
MarinaGryphon c720e947ed /decl/chem (#10538) 2021-01-17 00:11:28 +02:00
Wowzewow (Wezzy) f4956185cd Refactors Glass Jars (#10703) 2020-12-09 10:10:59 +01:00
Hockaa 878a51e1a6 Gumballs and gumball jars (#10628) 2020-11-26 11:25:43 +01:00
Wowzewow (Wezzy) 307c214541 makes w_class use defines (#9848) 2020-09-06 17:37:56 -03:00
Chada-1 d7e680a575 Full rename of all real chems to bone apple tea'd versions. (#9400)
As a continuation of #9389
As a bonus, any drugs that mentioned their IRL counterpart in their description now describe their predecessor as ancient, and the new ones as modern. The biggest difference here is just the Antihistamine which was given a full new name. They're similar enough that they'll be recognized (most of them) but different enough for us to call our own and not care what the real medicines are/do since these are our sci-fantasy versions just inspired by them.
2020-07-26 13:19:41 +03:00
Wowzewow (Wezzy) 4b432f1f96 fixes chewable trash items not spawning (#9418)
title

Fixes #9404
2020-07-22 23:16:56 +03:00
Joshie fb8af14858 Renames all instances of "Norepinephrine" to "Inaprovaline" (#9389)
It was a mistake to use real life chemicals on the grounds of "realism", especially when the chemical doesn't actually act realistically to how it does in real life. With the removal of the Inaprovaline medication as well, we can return the name to Norepinephrine, which was originally called Inaprovaline anyway.
2020-07-21 17:57:44 +03:00
Wowzewow (Wezzy) 89eb38177a The awesome fancy box update which looks super epic, immersive and cool (#9331)
rscadd: "The cookie snack now contains cookies, like the mint and gum packs. They've also been added to the rations box selection."
    rscadd: "Gum packs, mint packs and the cookie snack from the vending machines visibly open when clicked on."
    rscadd: "Gum packs, mint packs and the cookie snack can be crumpled up when empty. If you really wanted to, you still can crumple it with things inside, so long as you're in harm intent."
    rscadd: "Odd boxes, such as candle boxes, donut boxes, crayon boxes and egg boxes can be folded and unfolded from cardboard sheets."
    rscadd: "Donut boxes, egg cartons and cigarette packets visibly open when clicked on. Alt-click to close."
    rscadd: "Mints actually have a proper taste description now."
2020-07-18 00:10:53 +03:00
Wowzewow (Wezzy) 7cdd4ec5e2 Cigarettes and chewables stay in your mouth/hands when they go out, and cigs no longer stay lit in storage (#9302) 2020-07-14 11:52:14 +02:00
Geeves 33ad8096fb The Great Spanning (#9320)
This PR get rid of all (most of) the span("thing", spans and replaces them with the SPAN_THING( variant, which has gained more popularity recently.
2020-07-12 15:53:28 +03:00
MarinaGryphon 37c80988ce Converts Reagents to Typepaths and Centralises Reagent Spawning (#9140)
Converts reagents to use typepaths instead of IDs.
    Centralises reagent spawning in a lot of places to use reagents_to_add instead of a variety of custom methods or initialise overrides.
2020-07-05 20:47:48 +03:00
Wowzewow (Wezzy) a4c8f4b8dc Onehanded cigs, and a bunch of other stuff (#9279)
Surprisingly, doesn't really change that much user-facing side.

For some stupid reason, cigar cases were using a rehash of cigarette packet code for no good reason. So I just made it a parent item, and it works just fine.

also added a tooltip to share the rather obscure feature of putting a cigarette in your mouth.

resprites the tajaran cigarette packets to more accurately match where they come from
2020-07-05 18:34:07 +03:00
Wowzewow (Wezzy) fad8415a8e Pickup, Drop and Equip sounds (#8861) 2020-05-22 15:40:00 -03:00
mikomyazaki 21f348ec57 Adds a unit test to check for any missing initial icon states (#8332) 2020-02-23 02:43:12 -03:00
Wowzewow (Wezzy) 01a06d1197 New masks (#7614)
Adds new sprites for sterile mask and breath masks.
Adds new colorable cloth mask for civillians and dust mask mostly for industrial jobs.

Masks have been move to their own tab in loadout - namely because they have an entire seperate file for them, but apparently haven't been coded in their own tab. Also, they should equip properly on spawn now.
2019-12-21 12:40:58 +02:00
Wowzewow (Wezzy) ff25557eb8 The Rollable Cigs and Chews Update (#7631) 2019-12-20 23:48:17 +01:00
Matt Atlas df0cd6189a Brainmed Update (#7502)
gamer time.
2019-12-10 20:41:15 +02:00
Wowzewow (Wezzy) 3c376fe44a Chewable improvements, and new snacks (#7411) 2019-11-21 11:57:38 +01:00
Lady Fowl abe6e4b80b Ports Bubblegum (#7195) 2019-10-22 10:20:32 +03:00