Commit Graph

742 Commits

Author SHA1 Message Date
Werner
ddf56c1765 Added vkrexi cube boxes. (#5297)
As requested here https://forums.aurorastation.org/viewtopic.php?f=18&t=9245
2018-09-21 19:20:06 +02:00
Alberyk
41f6f5113c Tweaks and fixes some recipes and vaurca related drinks (#5223)
-fixes the pancake and adhomian bread recipes once for all
-adds the icecream sandwhich recipe, so you can complete that bounty
-fixes some messages when you open/shake a can
-tweaks the vaurca drinks, since they are already considerated caffeine, giving them a chem boost is kinda pointless, also removes some extra vars that did not have any use
2018-09-03 07:09:20 +03:00
BurgerLUA
6ba6055cd3 The Final* Foodcode Fix (#5211)
Foodcode was improved. Previously it was fucking garbage for using snowflake code but now it works as it should.

Fixes #5205
Fixes #5195
2018-09-03 07:08:54 +03:00
ParadoxSpace
b975cb3155 Adds Zo'ra Soda (#5160)
Adds a few drinks and four vendors to the station.
Zo'ra Soda contains VAAM (V'krexi vomit) which is similar to nicotine. The drinks themselves are energy drinks, particularly High Octane Zorane Might. C'thur Rockin' Raspberry and Royal Jelly (it gets you high) are available as contraband in the vendor.
2018-09-02 22:45:38 +03:00
Alberyk
df226aabf3 Reduces the meat requirement in the burrito's recipe (#5184)
-adds the following suggestion: https://forums.aurorastation.org/viewtopic.php?f=18&t=11810
-changes the vegan burrito sprite
-reduces the total protein of the burrito
2018-09-02 14:12:13 +02:00
Werner
6fdd325736 Merge branch 'upstream-master' into development-upstream 2018-09-01 22:45:34 +02:00
Alberyk
58e12bbaf6 Couple of fixes. (#5206)
-fixes changeling rejecting their own organs after transformation
-fixes eating having the wrong sound
2018-09-01 20:54:57 +03:00
BurgerLUA
9fdb93d160 Adds the ability to rename food (#5174) 2018-08-27 22:38:27 +03:00
BurgerLUA
9bbd0ab9ce Fixes drinking food (#5187) 2018-08-27 21:25:40 +03:00
BurgerLUA
99576e822c Added (#5186) 2018-08-27 00:58:22 +02:00
BurgerLUA
abec2948c9 Additional Reagent Fixes (#5170)
Fixes #5162
Fixes food unable to be placed specifically. Applied the specific placing code to all reagent containers, except for syringes, hypospray, and inhalers.
Fixes missing Kelotane reagent for borg hypospray.
2018-08-25 14:52:11 +03:00
MarinaGryphon
3a43596eb9 Fixes #5133 (#5152) 2018-08-16 22:14:04 +03:00
Werner
2cea96f0ea Fixes #5149 for injectors (#5154) 2018-08-16 22:13:41 +03:00
Werner
10594a803f Hypo Changes (#5150)
Fixes #5149
2018-08-13 23:25:49 +02:00
BurgerLUA
cf3bf81185 Fixes #5142 (#5143) 2018-08-13 23:41:41 +03:00
skull132
a910ded29b Merge branch 'master' into development 2018-08-11 21:41:05 +03:00
BurgerLUA
bba8870b72 Fixes #5125 (#5131) 2018-08-11 13:49:52 +03:00
BurgerLUA
672d2c2bf4 Fixes Food For Real Now (#5111) 2018-08-08 07:41:56 +03:00
ben10083
2bbf46cdee Service borg synthesizer upgrade (#5070)
Added coffee and espresso to service borg drink synthesizer
2018-08-07 21:25:19 +02:00
BurgerLUA
c31bcd2d72 Additional August Fixes (#5104)
Fixes #5101
Fixes plants/food being able to be poured into reagent containers.
Fixes server hanging during backpressure surge.
2018-08-07 22:09:30 +03:00
BurgerLua
afb9755a03 One more 2018-08-05 19:23:08 -07:00
BurgerLua
af04daa17b Added 2018-08-05 17:11:48 -07:00
skull132
b6e8ae4d53 Merge branch 'master' into development
# Conflicts:
#	code/modules/reagents/reagent_containers/inhaler.dm
2018-08-05 20:29:03 +03:00
BurgerLUA
1620d81661 Extinguisher + Container Reworks (#4793)
Reworked how slipping on tiles work. If there is too much lube/water on one tile, it will spread to all adjacent tiles.

Fixed a potential bug where spilling copious amounts of water on a tile will turn it to ice.

Containers are much more saner now. They all share a standard system, unless specified.

You can drink from any open holdable container using help intent. You can splash the contents of the container on anything via harm intent.

Sinks are more saner, you can refill or empty them easier with various refill amounts.

Removed silly exclusive cyborg limb checking for hyposprays.

Added a new chemsprayer, the "Xenoblaster" which is a significantly weaker chem sprayer. Two can be found in xenobiology.

Large reagent containers (beer kegs, water tanks, fuel tanks) now share a system together. Both can leak their reagents via harm intent with a wrench, and bother can accept any sort of reagent, with exception to the fuel tank.

Large reagent container leaking happens over time as opposed to just leaking every time it moves.

New chemical, Monoammonium phosphate. Monoammonium phosphate is a fertilizer and also a potent fire extinguishing and preventing chemical. It can be made with 1 part ammonia, 1 part sulfuric acid, 1 part sodium, 1 part phosphorus.

All extinguishers now have monoammonium phosphate in them instead of water.

Extinguishers can hold any reagent, however they must be filled using an extinguisher refiller cartridge. These can be ordered or found in atmospherics.

Nerfed the extinguisher range so it only sprays in a 3x3 radius.

Mini-extinguishers spray in a 1x1 radius.

Adds Monoammonium phosphate containers across the station.

Most watertanks are replaced with Monoammonium phosphate containers.
2018-08-05 20:14:00 +03:00
Werner
f1c7c4e091 Ports TGs System of Cargo Rewards and Bounties (#4998)
This Ports TGs System of Cargo Rewards and Bounties.
It also changes the paths of some of the foods (to be easier to use with the bounites)
It integrates the bounty application into the cargo control app
The cargo control app can now print invoices for orders and shipments
https://forums.aurorastation.org/viewtopic.php?f=21&t=11529
2018-08-04 21:34:18 +02:00
BurgerLUA
8519dcc393 .loc = to forceMove() (#4937)
As requested, this PR is changed to only include all .loc = to forceMove() changes.
2018-08-04 01:48:58 +03:00
Fire-and-Glory
2c5458f705 Changing vending machine K'ois description (#5069)
* Changed vendor-kois description
2018-08-02 01:25:31 +02:00
Alberyk
eb63c1d178 Food and seed update: the tobacco fixing (#5020)
-adds tobacco, peppercorn, onion and garlic seeds
-adds new cooking recipes, sprites from baystation and polaris
2018-08-02 01:10:25 +02:00
Erki
dd4ef4b3c3 Update, 22JUL2018
Episode VI, The Return of the Maymay.
2018-07-22 22:14:03 +03:00
BurgerLUA
9a0a82fc04 measure once, cut 10 times (#5014) 2018-07-19 21:44:00 +02:00
Erki
1e9dc76ab5 Fixes compile for dev (#4991) 2018-07-15 00:44:30 +02:00
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