Commit Graph

1389 Commits

Author SHA1 Message Date
Arokha Sieyes
805b473976 Polaris Sync Merge
Fixed Polaris merge conflicts
* Space controller merge conflict
2017-03-18 00:58:12 -04:00
Yoshax
fc4af03db8 Fixes a tea related issue 2017-03-16 00:15:33 +00:00
Neerti
d4b6fc9f32 Merge pull request #3052 from Anewbe/emp_things
Reworks empulse and emp_act
2017-03-14 21:39:01 -04:00
Anewbe
aa79162b97 Merge pull request #3085 from VOREStation/fixfood
Fixes 7 Recipes I Broke
2017-03-13 21:09:00 -05:00
Arokha Sieyes
c3d0f7e2dd Fixes 7 Recipes I Broke
LOOK NOBODY'S PERFECT OKAY

I added /food/ to the path of all the food recipes but these 7 have a completely silly means of actually creating the food items, and it results in that proc never being called because I didn't change THOSE to have /food/ in the path as well.

It's not like dough is important, okay.

And this mechanism of doing this is dumb.

And huff.

~~pleasedonthurtme~~
2017-03-13 21:36:13 -04:00
Arokha Sieyes
6dc1698752 Fixes 7 Recipes I Broke
LOOK NOBODY'S PERFECT OKAY

I added /food/ to the path of all the food recipes but these 7 have a completely silly means of actually creating the food items, and it results in that proc never being called because I didn't change THOSE to have /food/ in the path as well.

It's not like dough is important, okay.

And this mechanism of doing this is dumb.

And huff.

~~pleasedonthurtme~~
2017-03-13 21:35:22 -04:00
Anewbe
5481e90cbe Merge pull request #3074 from VOREStation/recipes
"Recipe Dump" admin verb
2017-03-13 17:17:54 -05:00
Arokha Sieyes
78f5111051 Fix flour!!! 2017-03-13 18:01:29 -04:00
Arokha Sieyes
fd58913efa Now it does drinks and not-quite-foods too
I had to subtype all the recipes though. This should probably have been done a while ago anyway, medicine and drinks should probably have some sort of path separation like this.
2017-03-13 18:01:19 -04:00
Arokha Sieyes
bbd5603905 Math is hard okay 2017-03-13 18:01:11 -04:00
Arokha Sieyes
166e888397 Find/replace job for bread slices
`/obj/item/weapon/reagent_containers/food/snacks/breadslice` is not a real thing. The only reason the code compiled with references to it is because there was a line at the top of sandwich.dm that defined the attackby proc for it, which willed it into existence with all the default 'snack' values so it was just called 'snack', had no icon, etc.

`/obj/item/weapon/reagent_containers/food/snacks/slice/bread` is the real path for bread slices, and this replaces all mentions of one with the other.
2017-03-13 14:16:10 -04:00
Arokha Sieyes
e2c4064f49 VR-specific fixes for this 2017-03-13 14:15:04 -04:00
Arokha Sieyes
8f9bb4cdc3 Find/replace job for bread slices
`/obj/item/weapon/reagent_containers/food/snacks/breadslice` is not a real thing. The only reason the code compiled with references to it is because there was a line at the top of sandwich.dm that defined the attackby proc for it, which willed it into existence with all the default 'snack' values so it was just called 'snack', had no icon, etc.

`/obj/item/weapon/reagent_containers/food/snacks/slice/bread` is the real path for bread slices, and this replaces all mentions of one with the other.
2017-03-13 14:14:49 -04:00
Arokha Sieyes
0bb3a71625 Merge pull request #1169 from VOREStation/aro-newpolsync
Polaris Sync
2017-03-13 01:50:11 -04:00
Arokha Sieyes
6e8667e948 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync
# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types.dm
#	code/modules/events/canister_leak.dm
#	code/modules/gamemaster/actions/canister_leak.dm
2017-03-13 01:29:01 -04:00
Arokha Sieyes
01edd04bc5 Add several new foods
Sushi, Lasagne, Wings, Doner Kebab, Reishi's Cup, Hot&Sour Soup, General Tso's, Kitsune Udon, Goulash, Roast Beef

Also made it so synths don't have reduced taste. You can just RP it however you want, I'd rather let them see the info about flavor and if you want to RP that you have low quality taste 'sensors' then so be it.
2017-03-13 00:36:34 -04:00
Arokha Sieyes
4c0e330140 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-polsync 2017-03-11 18:47:17 -05:00
Yoshax
14a667abec Adds more types of tea 2017-03-11 22:01:19 +00:00
Arokha Sieyes
279232997d Fix flour!!! 2017-03-11 01:14:15 -05:00
Arokha Sieyes
a2d89ae1b8 Now it does drinks and not-quite-foods too
I had to subtype all the recipes though. This should probably have been done a while ago anyway, medicine and drinks should probably have some sort of path separation like this.
2017-03-10 20:04:43 -05:00
Arokha Sieyes
1783dc282b Math is hard okay 2017-03-10 18:45:31 -05:00
Yoshax
3a31c88f43 Fixes sliceable food and slices 2017-03-10 19:49:15 +00:00
Yoshax
6f12826c45 Adds ability to add food to the chem master because the condimaster is beyond broken 2017-03-10 17:00:31 +00:00
Yoshax
26d56e2cf4 Fixes/adds reagent transferring to/from food 2017-03-10 16:39:57 +00:00
Screemonster
87f940293a adds particle guns to science and cargo 2017-03-09 18:10:26 +00:00
Anewbe
19710d9bd8 Reworks empulse and emp_act 2017-03-05 12:22:45 -06:00
Arokha Sieyes
5b13bcbb50 Merge pull request #1089 from Yoshax/ewwwfatpeople
Nutrition + Diet Changes
2017-03-04 18:35:07 -05:00
Arokha Sieyes
4f06a18057 Dragor fluff items, Aronai fluff item fixes
Also fixes *flip to not print an error message (emotes must have messages that they display) and redoes how vials start with reagents to make it easier to code them. Also swapping genders as a promethean won't randomize your hair anymore. That was silly, and relevant to Dragor's thing.
2017-03-04 16:04:43 -05:00
Arokha Sieyes
05719b68b4 Update pill.dm
Spell it out fam
2017-03-04 14:00:43 -05:00
Yoshax
f54ae4be13 Makes the diet pill more effective, and makes Lipozine more effective in general 2017-03-04 16:25:32 +00:00
Yoshax
17197cd66a Makes food less filling so you can eat more in a reasonable fashion
Like being able to drink a protein shake when you're hungry and now end up in grey overfed for 9 hours
2017-03-04 16:17:55 +00:00
Arokha Sieyes
387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Arokha Sieyes
2c493405bd More tweaks
Fix necrotic limb surgery
Make fever not so powerful that it resists cryotubes
All necrotic limbs produce toxins unless OD on spaceacillin, regardless of infection
Fix dropper use during surgery
Fix 'gap' in printable adv scanner infection reports
Fix nanoui template for adv scanner
Add examine text to gangrene and highly infected external limbs
Add flags to the MMI holder organs to make them robotic, and thus not infectable if they are > squishy MMI (posibrain, digital)
2017-02-28 01:13:29 -05:00
Yoshax
dad4e19785 Does custom food stuff 2017-02-19 01:02:12 +00:00
Arokha Sieyes
e4557b0724 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2017-02-14 20:29:57 -05:00
Screemonster
ce28b35275 Adds Krak-B-Gone, a silicate spray for fixing windows 2017-02-14 18:29:55 +00:00
Anewbe
c1008b52cd Merge pull request #2989 from MagmaRam/sandwich
Meat Meat Meat Meat Meat Meat and Fork Sandwich
2017-02-09 21:24:03 -06:00
Arokha Sieyes
b2499073d3 Remove adrenaline from vendor syringe 2017-02-06 19:59:03 -05:00
MagmaRam
f92e189cc7 Fixes not being able to pick up sandwiches with a fork if they're at max size. 2017-02-05 19:25:59 -06:00
Yoshax
f497cbf5cf Droppers are known for being inconsistent and inaccurate 2017-02-05 01:41:50 +00:00
Arokha Sieyes
94b621b310 Merge pull request #893 from Cameron653/master
Polaris Feburary Syncs
2017-02-02 23:06:13 -05:00
Cameron653
4a0913076c Travis should compile now 2017-02-02 18:56:37 -05:00
Cameron653
0eed3f1c34 Update Chemistry-Reagents-Food-Drinks.dm 2017-02-02 18:49:51 -05:00
Arokha Sieyes
2e6d423047 Fix chocolate milk
I am a man who can appreciate his chocolate milk. Unless his chocolate milk carton is always full of normal milk due to a faulty constructor inheritance scheme that fills it with first the wrong amount of milk, then tries to fill it with more wrong milk, then finally attempts to fill the soggy milk carton with chocolate milk.
2017-02-02 15:34:34 -05:00
Cameron653
c3fe93e59c Coffee isn't toxic to taj now 2017-02-02 14:31:27 -05:00
Cameron653
f9fa4c71b3 Coffee isn't toxic to tajarans 2017-02-02 14:30:03 -05:00
killer653
3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
Arokha Sieyes
4d79fe9a0e Fixes the pixels.
```
      ___           ___       ___           ___
     /  /\         /  /\     /  /\         /  /\
    /  /::|       /  /:/    /  /::\       /  /::|
   /  /:|:|      /  /:/    /  /:/\:\     /  /:|:|
  /  /:/|:|__   /  /:/    /  /::\ \:\   /  /:/|:|__
 /__/:/_|::::\ /__/:/    /__/:/\:\ \:\ /__/:/_|::::\
 \__\/  /~~/:/ \  \:\    \  \:\ \:\_\/ \__\/  /~~/:/
       /  /:/   \  \:\    \  \:\ \:\         /  /:/
      /  /:/     \  \:\    \  \:\_\/        /  /:/
     /__/:/       \  \:\    \  \:\         /__/:/
     \__\/         \__\/     \__\/         \__\/
```
2017-02-01 01:27:13 -05:00
Anewbe
62d19de99f Merge pull request #2929 from Anewbe/taste
Ports taste from Bay
2017-01-28 21:06:21 -06:00
Anewbe
701695ba07 Changes two taste descriptions 2017-01-28 20:57:54 -06:00