Commit Graph

861 Commits

Author SHA1 Message Date
skull132
8348bf711c Merge branch 'master' into development 2018-07-14 15:01:05 +03:00
BurgerLUA
ddaf0b0d3e Fixes inhalers having odd interactions with masks (#4988)
The code for whether or not gas could be inhaled wasn't good. This fixes that.
2018-07-14 13:13:21 +03:00
Lohikar
a15aa07307 Fix Phantom Globals (#4957)
Removes the phantom global definitions that Fowl found.

Fixes:

Game log in GELF not logging proper target.
Pylon attacks not detecting the actual firer of a damaging bullet.
A message in the mixer cooking machine.
A message in airbubbles.
A use_check sanity check in landmines.
Some messages in psych therapy code.
A view() checkk in psych therapy code.
CCIA being unable to announce incoming faxes in some circumstances.
Language whitelists potentially checking the whitelists of the last person to throw a tray in addition to the pref mob.
Fixes some messages/sounds with some custom items.
Fixes a message with digging into the asteroid.
Fixes electrocution code not properly checking for absurdly long hair.
Fixes a broken message in devour.
Fixes a targeting issue with player-controlled hostile ranged mobs.
Fixes failure behavior for modular RnD guns.
Fixes an intent safety check on gun aim.
Fixes the Harvester knock spell potentially not working.
2018-07-01 22:47:58 +03:00
Werner
6481d97c31 Adds a armorcheck to hyposprays. (#4894)
If a target is armored, then it takes some time to inject them with a hypospray (simmilar to the needles).
2018-06-22 22:37:24 +03:00
Alberyk
0238893f18 Adds more tajaran cuisine (#4845)
This pr adds some dishes, plants and drinks based on the tajaran lore. The meat and clams can't really be found anywhere right now, as they are supossed to be ordered from cargo.

Also fixes some foods having proteins for no reason and adds a new frappe sprite.

Sprites made by dronz, brainos, and some others were found in the vgstation and tgstation codebases.
2018-06-14 21:41:05 +02:00
skull132
9d2dfbd9c0 Merge branch 'master' into development
# Conflicts:
#	maps/aurora/aurora-4_mainlevel.dmm
2018-05-29 22:49:41 +03:00
Kaedwuff
809526ce00 Duller syringes (#4818)
Fixes #4811

Added a new 'noslice' variable that can be used to check if something that has the 'sharp' tag should be able to slice fruit.
2018-05-29 00:26:16 +02:00
Octopus
c8fe4454a8 Minor Kitchen Changes (#4765)
Ports Mixing Bowls from Baystation.
Adds Mixing Bowls to the Kitchen Vendor.
Removes the Butcher Knife from the contraband List, add its to the normal Kitchen Vendor.
Balances the Kitchen Vendor around two Chefs.
2018-05-27 00:57:12 +03:00
BurgerLUA
7e5482957e Fixes Various Food Bugs (#4769)
Fixes various food related bugs.

Mixing flour and animal protein will now create raw meatballs instead of cooked meatballs.
Fixes #4763
Fixes #4753
Fixes #4737
2018-05-20 18:18:17 +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
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
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
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
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
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
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
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
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
BurgerLUA
9e260124c3 CHIPS AND DIP and also burritos (#4079) 2018-01-16 01:11:48 -06:00
Lohikar
6f85f08718 Convert a bunch of legacy overlay calls to SSoverlays (#4015)
Bunch of overlay conversions I found in an old stash I had forgotten about.
2018-01-07 00:34:47 +02:00
BurgerLUA
1535801dd4 Biogenerator Powercreep + Improvements (#4045)
The biogenerator seemed pretty useless on top of a generally boring job. There wasn't really anything interesting you could make with the default biogenerator recipes so I went on a quest to add more useful recipes that make sense. I looked at the code and it was pretty shit (everything was hardcoded, and there was also an exploit involving monkeys) so I added a better framework for adding biogenerator recipes, and added multiple item making.
2018-01-05 11:59:58 +02:00
Alberyk
c4479586c1 Ports material and makeshift armor from Polaris (#3968)
-adds support to material clothing, already used by rings and makeshift weapon
-adds makeshift armor that you can craft using buckets for helmets and material sheets to make the plates
-adds a wooden bucket that can be crafted using planks also ported from polaris
-adds icon_has_variants to some sheets, adding sprites to them from tg
-fixes bronze being just a place holder
-adds sheet types to bronze and titanium
2017-12-23 21:12:39 +02:00
LordFowl
2ac73351b8 Unapologetic Vaurca Buffs (#3949) 2017-12-12 13:15:45 -06:00
Ron
2dd08367b8 Adds shaking soda cans (#3811) 2017-11-16 11:24:11 -06:00
Alberyk
8dd97ed30b Adds new reagents and recipes (#3688)
This pr adds some new reagents and recipes, to be used properly with the feature added by #3522.
2017-11-15 23:11:51 +01:00
skull132
7dc02be204 Merge branch 'master' into development
# Conflicts:
#	code/controllers/subsystems/initialization/misc_early.dm
#	config/example/config.txt
#	maps/aurora/aurora-1_centcomm.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
2017-11-11 20:57:28 +02:00
Synnono
a0d588ba1c Bar Update 2: Electric Boozealoo (#3795)
* Added 13 drinks, mostly cocktails. Added lemon juice in carton format. Added Lemon juice, boukha and fireball to the booze-o-mat.

* More drinks, fixed the Old Fashioned a la Incog, tweaked a few of my recipes.

* Added drinks, added brownstar to the soft drink dispenser, modified descriptions.

* Finished adding drinks, tested all recipes, adjusted reaction values.
More testing to follow

* Renamed fireball, recipe tweaking/testing. Added sprite for metropolitan.

* Testing, spelling pass, adjusted some erroneous tastes or descriptions on other drinks.

* Changelog meme

* White wine. Last minute.

* formatting in description text

* Instances of wwine changed to whitewine.

* Typos
2017-11-05 22:44:28 +01:00
Erki
7b1bcdc8f3 October Bugfix Bonanza (#3767)
Fixes #3742 - someone unfucked the fix again.
Resolves #3740 and resolves #3739.
Fixes #1558 - a 10 month long meme is dead.
Resolves #3720 by making robo-eyes immune only to the eye stinging effects of pepperspray. Let there be equality amongst the synths.
Fixes #3676 - tested, shouldn't break. It was double-calling set_death_timer.
Fixes #3672 and fixes #3658 - that was my bad on not noticing the diff around hologram.icon = icon vs add_overlay(icon).
Fixes #3762 - I'm surprised this didn't fuck over more.
2017-10-29 19:03:24 +02:00
Ron
0d0117dcff Fixes some runtimes (#3727) 2017-10-22 02:37:44 +03:00
Alberyk
25c805de1c Adds more food recipes (#3544) 2017-10-07 00:41:29 -05:00
Alberyk
8e53ea0c78 Cult and antag fixes/tweaks (#3524) 2017-10-02 22:34:01 -05:00
Ron
aa57b9556e Small chemistry changes (#3525)
Beakers now show a message if they have solids inside
Added an accuracy rating to containers. Containers will only tell you how many units of chemicals there are according to how accurate they are.
2017-10-01 15:18:48 +02:00
Lohikar
8f4b4effae Kill processing_objects (#3398) 2017-09-09 15:22:58 -05:00