Commit Graph

1362 Commits

Author SHA1 Message Date
Kaedwuff c011b1d9b8 Fix for Bahama Lizard cocktail. (#4718)
I created some conflicting recipes accidentally with my lizard drinks.

This should fix the problem and allow Bahama Lizards to be made.
2018-05-15 10:15:56 +03:00
BurgerLUA c4cda59621 This PR is the very definition of "They were right." (#4729)
Fixes various runtime bugs caused due to not testing the requested changes, such as the inhalers not playing sounds or the breath analyzer not analyzing breath.

Also improves some things due to feedback, such as the breath analyzer doing too much damage when thrown, and the garden being weird.
2018-05-14 10:17:20 +03:00
Alberyk 34477cf04d Bug fixes for may update of 2018 (#4726)
-fixes all food having chocolate
-fixes #4725
-removes a bad file that was supossed to be a changelog
2018-05-14 00:45:28 +03:00
Erki 613f55c56a Reverts alcohol changes partially (#4722)
Restores old rates of gaining and losing intoxication.
The strength of alcohol was implemented with the original formula in mind, you cannot simply add another curve and expect it to fit. The rate of getting drunk was way too fast (increased 7 fold!). I also doubled the rate of losing alcohol, since gains and losses typically work in balance with one another.
Fixes a bug which spammed, "You're drunk"
2018-05-13 22:15:55 +03:00
skull132 674cd94714 Merge branch 'master' into development
# Conflicts:
#	maps/aurora/aurora-3_sublevel.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
#	maps/aurora/aurora-5_interstitial.dmm
2018-05-13 19:19:52 +03:00
BurgerLUA aad698be53 Mental Medication Additions (#4648)
The less controversial tweaks
Tweaked the metabolism rate of mental medication to reflect their intended values. Reduced the dosage threshold to suppress traumas to reflect their intended values.

Syringe (drugs) now contains truth serum.

Cardox is now slightly poisonous, and can directly remove phoron from blood when consumed. Cardox can now remove phoron in the air when applied to turfs.

A secure box of loyalty implants, hextrasenil pills, and cardox grenades are now located in the vault.

The vault now contains some misc emergency gear that a head of staff can access in case of a dire situation. Current gear are loyalty implants, expensive cardox grenades, and Hextrasenil pills.
2018-05-13 17:39:56 +03:00
Alberyk a9e0afefd7 Fixes feeding animals creating ghost food. (#4695)
fixes #4293
2018-05-07 22:30:25 +03:00
BurgerLUA 3a4c927435 Adds Butanol Drinks to Flasks (#4686)
What the title says. It's very simple.

It just werks.
2018-05-06 18:55:00 +03:00
skull132 43367708ec Merge branch 'master' into development 2018-05-02 21:07:35 +03:00
MarinaGryphon a9e42d20d2 Secret chem fixes (#4685)
Fixes a duplicate definition of azoth's worth (went with the second, higher one).
Makes liquid light have the same capitalisation as Liquid Fire, Chloral Hydrate, Potassium Chlorophoride, etc. instead of being the only lowercase chemical name.
2018-05-02 21:01:19 +03:00
skull132 1d2b72370f Merge branch 'master' into development 2018-05-02 08:32:46 +03:00
Werner b38c30a057 Fixes 4680 (#4682) 2018-05-02 08:31:54 +03:00
Alberyk 207608b60c Ports some sounds from baystation (#4675)
This pr ports some sounds effects from baystation12, it has sounds for:

-using medical items
-using hyposprays
-opening some storages, like briefcases and toolboxes
-lighting matches
-magboot activation sounds
-holster sounds
-tape sounds
-pen and stamp sounds
2018-05-02 00:20:56 +03:00
BurgerLUA 652baabb5a More Food (#4644)
Adds more food for the chef to cook. Items include:
Bacon Flatbread (Not pizza)
Breakfast Wrap
Meat Pocket
Fish Taco
Pineapple Rings
Pineapple Pizza
Chocolate Truffles
Bacon Burger
NtMuffin
BLT
2018-05-01 20:11:56 +02:00
Werner d4e9990e82 Fixes #4626 (#4658)
Fixes #4626 and converts it to absolute paths
2018-04-25 22:59:25 +03:00
BurgerLUA 4075ecff32 Medication + Lotto Ticket Fix (#4616)
Fixed Escitalopram causing insane amounts of drowsiness.
Tweaked the mental medication names to reflect proper naming formats.
Reduced the lottery ticket drumroll sound
2018-04-15 22:15:54 +03:00
Erki edf8f1962b Fixes #4563 (#4565) 2018-04-08 20:49:37 +03:00
Erki 4f0dbb2690 Revert and replace #4127 -- Funk jood, round deux (#4481)
Reverts the new chemicals and their effects as implemented in #4127 due to their unnecessary severity.

Replaces the reverted mechanics with new mechanics which seek to accomplish a similar thing. Mobs now have an nutrition_attrition_rate factor, which is a multiplier describing how fast they grow hungry. By default, the multiplier is 1. Only eating healthy/chef food will see to it that said multiplier remains at 1.
2018-04-07 00:41:43 +02:00
skull132 25ef886bf9 Merge branch 'master' into development 2018-04-06 21:53:02 +03:00
Ron aedcaab802 Bug Fixes (#4527)
Fixes part of #4490
Fixes #4462
Fixes #4457
Fixes #3685
Closes #4331
Fixes #4254
Fixes #4258
Fixes #4209
Fixes #4030
Fixes #4525
Fixes #4461
Fixes #4524
2018-04-06 17:48:31 +03:00
Zelmana 3d7938c3aa Adds Root Beer (#4500)
-Adds R&D Root Beer to reagents (no recipes)
-Adds R&D Root Beer to Robust Soft Drinks Dispenser
-Adds R&D Root Beer can sprite
-Adds R&D Root Beer in-glass sprite
2018-04-03 10:32:18 +02:00
skull132 f026545084 Merge branch 'master' into development 2018-04-01 18:14:11 +03:00
skull132 fb5feec40f Revert #4504 & #4496 2018-04-01 18:13:34 +03:00
BurgerLUA 03b09ed44f Spelling Issue Fix (#4496)
Changes colour to color in mental medication.
2018-04-01 00:49:00 +03:00
BurgerLUA 902173f22b Mental Medication Overhaul, Smoking, and Breathing Reagents (#4220)
Overview
With the new implementation of Brain Trauma, I find it would be best for the antidepressants to include some relation to it. Obviously, Lord Fowl was away ahead of me and implemented them in the update already, but not the way that I would like it to be implemented.

Antidepressants
Currently, taking antidepressants suppress brain trauma conditions, however the suppression of brain trauma is not relative to the strength and dosage of the medication much like actual antidepressants. This proof-of-concept update now introduces a framework that factors in the dosage of the medication when it comes to applying or removing brain trauma effects, as well as adds harsher penalties for missing dosages which are relative to your regular dose.

Additional antidepressants are added to the update. Antidepressants are no longer a "one pill cures all" but many pills that cures 1-4 things. There are also two additional medications that act as some sort of loyalty pill, and a pill that acts as a disloyalty pill. The messages for the disloyalty pill only express rebellious nature, and isn't meant as a pill that gives an excuse to antagonize.

The following brain traumas are no longer cured by pills:

Dumbness
Gerstmann Syndrome
Cerebral Near-Blindness
Mutism
Cerebral Blindness
Paralysis
Narcolepsy
Discoordination
Aphasia
Smoking Cigarettes and Cigars
All cigarettes and cigars have a tobacco and nicotine reagent. These reagents slowly deals minor organ damage to certain organs while acting as a very mild painkiller, antidepressant, and stimulant. Like before, cigarettes can be injected with additional medicine, however the medicine is applied over time while you're smoking it, instead of all at once. Custom cigarettes can be made in the biogenerator, our found elsewhere, and can hold up to 15 units of reagents.

Breathing
Breathing emotes are played every second. Before, being in a smoke cloud would force you to "eat" the smoke. This update fixes it so that the smoke is breathed in instead. Currently, there isn't really any change, but it adds potential for new reagent effects such as inhalers or gassing people properly. If you have a mask with internals on, you're immune to the effects.

Additional Changes
Most reagents had no effect if they had less than 0.01 metabolism. This update fixes that so that most reagents can metabolize at less than 0.01. Painkillers and other special reagents still have a similar cap.

Discussion thread: https://forums.aurorastation.org/viewtopic.php?f=18&t=10261
2018-03-25 21:51:27 +03:00
BurgerLUA 296a3fc190 Junkfood Tweaks + Lottery Ticket Tweaks (#4445)
Lottery tickets now contain 3 scratches per card, but with reduced winnings.

Lottery tickets now take longer to scratch.

Improved effects of lottery tickets, including sound and voice.

Skrell Snacks no longer have shortening.

Beef Jerky and Raisins no longer have palm oil.

Cheese Honkers have reduced MSG.

Bread Tubes only have 1 unit of shortening.

Meat Pies have reduced MSG.

Cured Hams have increased MSG.
2018-03-21 07:13:49 +02:00
Ivan Rubinson a77a96cbe4 Bartender power creep (#4281)
Bar functions as part time coffee shop

Overhauled the coffee system and removed the old incomplete one.
2018-03-16 20:55:32 +01:00
Alberyk 12f3bb080f Fixes cardox recipe (#4417)
-fixes #4415
-fixes gun offhand having pins
-fixes cloth having the same hardness as steel
2018-03-15 12:43:52 +02:00
BurgerLUA 6cb9155af3 Fixes non-unathi from taking toxin damage when eating food. (#4389) 2018-03-11 13:05:05 +02:00
BurgerLUA bb87563e6d The k'ois nerf to end all k'ois nerfs (#4304)
Overview
K'ois bars are now replaced with a less dangerous variant with the same name. These K'ois bars do not cause medical nightmares to occur, however the dangerous ones are moved to the "contraband" section of the vending machine and can be vended for free.

New Chemicals
Unfiltered K'ois can still be found in K'ois spores. They can be filtered by grinding them up and adding Cardox . Cooking recipes are untouched, and still contain unfiltered K'ois.

Platinum can now be put into reagent form by grinding up platinum.

Cardox is a new chemical designed by nanotrasen that eliminates liquid phoron. It can be made by mixing Platinum, Sterilzine, and Carbon.
2018-03-03 00:34:48 +02:00
BurgerLUA a9217d4342 [READY] Unathi Meat Selection + BACON! (#4147)
Overview
There didn't seem like a lot of meals that a chef could make for unathi patrons without wasting ingredients and nutrition. This PR adds a bunch of animal protein heavy meals that would make a skrell animal activist beg for mercy upon the sight of said meals.
2018-02-26 23:00:14 +02:00
Kaedwuff 00e48eb7da Added unathi cocktails (#4300)
Added a number of cocktails intended for unathi to the game, many of which are based on existing cocktails, but contain butanol instead of ethanol ingredients. Many of them also have custom sprites.
2018-02-26 20:05:52 +01:00
Lohikar 2d8e36544f Reagent Cleanup/Tweaks (#4301)
changes:

The reagent and recipe lists have been moved fully into SSchemistry instead of a weird ref-shared global.
The reagent list is now sorted alphabetically, which should make dialogs that involve selecting reagents much nicer to use (such as Spawn-Chemical-Cartridge).
Butanol and Ethanol now share a parent: /datum/reagent/alcohol. Alcohol is an abstract type that won't be listed in any global reagent lists, and exists purely to pool code common to both butanol and ethanol.
Butanol-based drinks can now cause hallucinations, body temperature changes, and stimulation similar to ethanol-based drinks.
Reagent init is now in SSchemistry, both code-wise and init-stage wise.
2018-02-25 20:32:53 +02:00
skull132 bfced36a28 Merge branch 'master' into development
# Conflicts:
#	html/changelogs/sdtwbaj-skrellmoney.yml
2018-02-24 21:09:27 +02:00
BurgerLUA 32eff0a6da Improves #4079 (#4237)
- Given that K'ois is now unsafe as hell, the El Diablo burrito recipe no longer requires phoron. 
- Dips are more flavorful.
- The tortilla recipe no longer requires salt.
- Tortillas now give more protein, enhancing the flavor of meat.
2018-02-19 22:29:50 +01:00
BurgerLUA 475519c539 Junkfood Powernerf + Some pain and organ tweaks (#4127)
Added several new preservatives and flavorings in vending machine junkfood. As a result, junkfood is now more filling
Tweaked pain messages.
Penalties for Organ damage now start at >=1 instead of >0.
Added Adipemcina, a fictional heart medication that specially reduces heart damage.
2018-02-19 00:31:38 +01:00
Mykhailo Bykhovtsev 4bab95bf15 Trench coat update (#4050)
Changed trench coat, detective's trench coat, and gentlecoat to all be able to button up and down

Also updated all references of old path to new
Finished!
2018-02-13 22:11:53 +02:00
Karolis 998ef33ee2 Preparations for BYOND version 512 (#4024)
Makes sure code can compile and work under new version of BYOND.
2018-02-11 00:18:44 +02:00
Erki 20fc059ca7 Bugfix/runtime cleanup (#4249)
Some RTs.

Fixes #4091
Fixes #4092
Fixes #4077
2018-02-08 11:59:11 +02:00
Alberyk c0425a867c More bugfixes for the january update (#4200)
-fixes #4172
-fixes #4193
-fixes #4192
-fixes #4189
-fixes #4179
-fixes #4170
-fixes #4197
-fixes #4201
-changes the access of the security checkpoint, so all heads of staff can use it
-fixes the hop being unable to access the account's computer
-fixes being able to feed holodeck penguins
-fixes modular laser weapons not interacting with firing pins
-fixes more guns not interacting with pins and remove the need for pins from certain guns, like crossbow, alien weapons and etc
-fixes unstable matter's portals and the elixir of life
-nerfs liquid fire a bit
2018-01-29 22:54:01 +02:00
BurgerLUA 596fb2ef85 Fixes #3881, #3965, #4070, #4079 (#4181)
Overview
Fixes/Tweaks PRs #3881 , #3965 , #4070 , and #4079.

#3881
Auto-Hiss was really bad. There is now a chance that the Dionaea autohiss will actually fully pronounce a word properly. Words like "everything" and "course" are no longer read as "eeeeveeerthing" or "courseeee".

#3965
Poking people with the cane would sometimes cause an excessive amount of blood, so I just removed the damage altogether poke people at your own leisure now.

#4070
Some garbage items had too high of a chance. Hindsight, it's dumb for an arcade machine to vend alcohol. The red space suit replica is also useless and doesn't work really.

#4079
Burritos used a terrible way of mixing chemicals in recipes, so now they have a proper way of transferring chemicals. Burritos now also require more meat, and by extension, are now more filling.
2018-01-28 19:48:35 +02:00
LordFowl ad00601b81 Ports /tg/ Brain Trauma (#3979) 2018-01-27 12:13:19 -06:00
LordFowl e656f2743c [Ready For Review] Unapologetic Vaurca Buffs II: Attack of the K'ois (#4083)
Implements Black K'ois
Implements K'ois Mycosis
Implements Black K'ois Mycosis
Buffs K'ois' healing properties for Vaurca
Vaurca can now control where they bite
2018-01-27 17:52:30 +02:00
Alberyk 7ea1a89433 Phylactery and holy water additions (#4153)
-picking up a phylactery now gives a message of how this thing might be bad and flickers the lights around you
-holy water will now set the undead on fire
2018-01-27 13:31:59 +01:00
Lohikar 0abc1d2a65 Repath a bunch of things to /mob/abstract childtypes (#4111)
* Repaths eyes, observers, dview, and new_players to /mob/abstract subtypes.

* Adds /mob/abstract, a base type for 'abstract' mobs that aren't meant to be directly affected by the game world.
2018-01-24 11:27:14 +01:00
skull132 1e973b2d6a Merge branch 'master' into development
# Conflicts:
#	code/modules/multiz/movement.dm
#	maps/aurora/aurora-1_centcomm.dmm
#	maps/aurora/aurora-3_sublevel.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
#	maps/aurora/aurora-6_surface.dmm
2018-01-21 23:51:44 +02:00
Lohikar 90886a3076 Branded IPCs (#3388)
This PR adds 2 subtypes of industrial and two subtypes of baseline, one for each cybernetics manufacturer. Sprites by BRAINOS.

other changes:

IPCs can now be flashed or flashbanged.
Admin spawn paths have been added for subspecies that did not have them.
IPCs are no longer slowed by being cold.
2018-01-21 00:34:06 +02:00
Alberyk a367240477 Returns old alien weeds (#4075)
This update returns the alien weeds to their old behavior, instead of just being regular vines that turns any alien round into a giant clusterfuck. Also fixes alien acid being unable to melt the floor.
2018-01-16 15:14:59 +02:00
BurgerLUA 9e260124c3 CHIPS AND DIP and also burritos (#4079) 2018-01-16 01:11:48 -06:00
Hayden 32a9afb941 Fix infinite while loop in chemistry (#4113) 2018-01-14 23:15:21 -06:00